##// END OF EJS Templates
Add meson fix to handle ressources
perrinel -
r1158:416a389b3fe9
parent child
Show More
@@ -1,4 +1,3
1
2 qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep'])
1 qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep'])
3 catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','CatalogueAPI_dep'])
2 catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','CatalogueAPI_dep'])
4
3
@@ -52,9 +51,18 gui_ui_files = [
52
51
53 gui_qresources = ['resources/sqpguiresources.qrc']
52 gui_qresources = ['resources/sqpguiresources.qrc']
54
53
54 rcc_gen = generator(rcc,
55 output : 'qrc_@BASENAME@.cpp',
56 arguments : [
57 '--output',
58 '@OUTPUT@',
59 '@INPUT@',
60 '@EXTRA_ARGS@'])
61
62 rcc_files = rcc_gen.process(gui_qresources, extra_args : ['-name', 'sqpguiresources'])
63
55 gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
64 gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
56 ui_files : gui_ui_files,
65 ui_files : gui_ui_files)
57 qresources : gui_qresources)
58
66
59 gui_sources = [
67 gui_sources = [
60 'src/SqpApplication.cpp',
68 'src/SqpApplication.cpp',
@@ -116,6 +124,7 gui_inc = include_directories(['include'])
116 sciqlop_gui_lib = library('sciqlopgui',
124 sciqlop_gui_lib = library('sciqlopgui',
117 gui_sources,
125 gui_sources,
118 gui_moc_files,
126 gui_moc_files,
127 rcc_files,
119 include_directories : [gui_inc],
128 include_directories : [gui_inc],
120 dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep],
129 dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep],
121 install : true
130 install : true
@@ -125,3 +134,4 sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,
125 include_directories : gui_inc,
134 include_directories : gui_inc,
126 dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep])
135 dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep])
127
136
137
General Comments 0
You need to be logged in to leave comments. Login now