| @@ -10,7 +10,8 qt5network = dependency('qt5', modules : 'Network') | |||
|
|
10 | 10 | qt5printsupport = dependency('qt5', modules : 'PrintSupport') |
|
|
11 | 11 | qt5test = dependency('qt5', modules : 'Test') |
|
|
12 | 12 | |
|
|
13 |
moc = find_program('moc','moc |
|
|
|
13 | moc = find_program('moc-qt5','moc') | |
|
|
14 | rcc = find_program('rcc-qt5','rcc') | |
|
|
14 | 15 | |
|
|
15 | 16 | subdir('core') |
|
|
16 | 17 | subdir('gui') |
| @@ -18,7 +18,7 amdaplugin_resources_files = [ | |||
|
|
18 | 18 | |
|
|
19 | 19 | amdaplugin_inc = include_directories(['include', '../../plugin/include']) |
|
|
20 | 20 | |
|
|
21 | gen = generator(moc, | |
|
|
21 | moc_gen = generator(moc, | |
|
|
22 | 22 | output : 'moc_@BASENAME@.cpp', |
|
|
23 | 23 | arguments : ['@INPUT@', |
|
|
24 | 24 | '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"', |
| @@ -26,15 +26,24 gen = generator(moc, | |||
|
|
26 | 26 | '-I', meson.current_source_dir()+'/../../plugin/include', |
|
|
27 | 27 | '-o', '@OUTPUT@']) |
|
|
28 | 28 | |
|
|
29 | amdaplugin_moc_plugin_files = gen.process(amdaplugin_moc_headers) | |
|
|
29 | rcc_gen = generator(rcc, | |
|
|
30 | output : 'qrc_@BASENAME@.cpp', | |
|
|
31 | arguments : ['--name=@BASENAME@"', | |
|
|
32 | '--output', | |
|
|
33 | '@OUTPUT@', | |
|
|
34 | '@INPUT@']) | |
|
|
35 | ||
|
|
36 | amdaplugin_moc_plugin_files = moc_gen.process(amdaplugin_moc_headers) | |
|
|
37 | ||
|
|
38 | amdaplugin_rcc_plugin_files = rcc_gen.process(amdaplugin_resources_files) | |
|
|
30 | 39 | |
|
|
31 | 40 | amdaplugin_moc_files = qt5.preprocess( |
|
|
32 |
ui_files : amdaplugin_ui_files |
|
|
|
33 | qresources : amdaplugin_resources_files) | |
|
|
41 | ui_files : amdaplugin_ui_files) | |
|
|
34 | 42 | |
|
|
35 | 43 | sciqlop_amdaplugin = library('amdaplugin', |
|
|
36 | 44 | amdaplugin_sources, |
|
|
37 | 45 | amdaplugin_moc_files, |
|
|
46 | amdaplugin_rcc_plugin_files, | |
|
|
38 | 47 | amdaplugin_moc_plugin_files, |
|
|
39 | 48 | cpp_args : '-DAMDA_LIB', |
|
|
40 | 49 | link_with : [sciqlop_core, sciqlop_gui], |
General Comments 0
You need to be logged in to leave comments.
Login now