From 416a389b3fe9e36ee4782b5da65ac8f549fc2b09 2017-12-18 08:34:58 From: mperrinel Date: 2017-12-18 08:34:58 Subject: [PATCH] Add meson fix to handle ressources --- diff --git a/gui/meson.build b/gui/meson.build index 727fa0d..7899701 100644 --- a/gui/meson.build +++ b/gui/meson.build @@ -1,4 +1,3 @@ - qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep']) catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','CatalogueAPI_dep']) @@ -52,9 +51,18 @@ gui_ui_files = [ gui_qresources = ['resources/sqpguiresources.qrc'] +rcc_gen = generator(rcc, + output : 'qrc_@BASENAME@.cpp', + arguments : [ + '--output', + '@OUTPUT@', + '@INPUT@', + '@EXTRA_ARGS@']) + +rcc_files = rcc_gen.process(gui_qresources, extra_args : ['-name', 'sqpguiresources']) + gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers, - ui_files : gui_ui_files, - qresources : gui_qresources) + ui_files : gui_ui_files) gui_sources = [ 'src/SqpApplication.cpp', @@ -116,6 +124,7 @@ gui_inc = include_directories(['include']) sciqlop_gui_lib = library('sciqlopgui', gui_sources, gui_moc_files, + rcc_files, include_directories : [gui_inc], dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep], install : true @@ -125,3 +134,4 @@ sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib, include_directories : gui_inc, dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep]) +