| @@ -31,9 +31,8 sciqlop_app = executable('sciqlop', | |||||
| 31 | app_sources, |
|
31 | app_sources, | |
| 32 | app_moc_files, |
|
32 | app_moc_files, | |
| 33 | rc, |
|
33 | rc, | |
| 34 |
|
|
34 | include_directories : [ app_inc], | |
| 35 |
|
|
35 | dependencies : [sciqlop_gui, sciqlop_core], | |
| 36 | dependencies : [qt5core, qt5printsupport, qt5gui, qt5widgets, qt5network], |
|
|||
| 37 | install : true |
|
36 | install : true | |
| 38 | ) |
|
37 | ) | |
| 39 |
|
38 | |||
| @@ -43,14 +43,20 core_sources = [ | |||||
| 43 |
|
43 | |||
| 44 | core_inc = include_directories(['include', '../plugin/include']) |
|
44 | core_inc = include_directories(['include', '../plugin/include']) | |
| 45 |
|
45 | |||
| 46 | sciqlop_core = library('sciqlopcore', |
|
46 | sciqlop_core_lib = library('sciqlopcore', | |
| 47 | core_sources, |
|
47 | core_sources, | |
| 48 | core_moc_files, |
|
48 | core_moc_files, | |
| 49 | cpp_args : '-DCORE_LIB', |
|
49 | cpp_args : '-DCORE_LIB', | |
| 50 | include_directories : core_inc, |
|
50 | include_directories : core_inc, | |
| 51 |
dependencies : [qt5core, qt5 |
|
51 | dependencies : [qt5core, qt5network], | |
| 52 | install : true |
|
52 | install : true | |
| 53 | ) |
|
53 | ) | |
| 54 |
|
54 | |||
|
|
55 | ||||
|
|
56 | sciqlop_core = declare_dependency(link_with : sciqlop_core_lib, | |||
|
|
57 | include_directories : core_inc, | |||
|
|
58 | dependencies : [qt5core, qt5network]) | |||
|
|
59 | ||||
|
|
60 | ||||
| 55 | subdir('tests') |
|
61 | subdir('tests') | |
| 56 |
|
62 | |||
| @@ -12,9 +12,7 tests = [ | |||||
| 12 | foreach unit_test : tests |
|
12 | foreach unit_test : tests | |
| 13 | test_moc_files = qt5.preprocess(moc_sources : unit_test[0]) |
|
13 | test_moc_files = qt5.preprocess(moc_sources : unit_test[0]) | |
| 14 | test_exe = executable(unit_test[1],unit_test[0] , test_moc_files, |
|
14 | test_exe = executable(unit_test[1],unit_test[0] , test_moc_files, | |
| 15 |
|
|
15 | dependencies : [sciqlop_core, qt5test]) | |
| 16 | include_directories : core_inc, |
|
|||
| 17 | dependencies : [qt5core, qt5widgets, qt5network,qt5test]) |
|
|||
| 18 | test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])]) |
|
16 | test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])]) | |
| 19 | endforeach |
|
17 | endforeach | |
| 20 |
|
18 | |||
| @@ -61,12 +61,15 gui_sources = [ | |||||
| 61 |
|
61 | |||
| 62 | gui_inc = include_directories(['include']) |
|
62 | gui_inc = include_directories(['include']) | |
| 63 |
|
63 | |||
| 64 | sciqlop_gui = library('sciqlopgui', |
|
64 | sciqlop_gui_lib = library('sciqlopgui', | |
| 65 | gui_sources, |
|
65 | gui_sources, | |
| 66 | gui_moc_files, |
|
66 | gui_moc_files, | |
| 67 |
|
|
67 | include_directories : [gui_inc], | |
| 68 | include_directories : [gui_inc, core_inc], |
|
68 | dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core], | |
| 69 | dependencies : [qt5core, qt5printsupport, qt5gui, qt5widgets, qt5network], |
|
|||
| 70 | install : true |
|
69 | install : true | |
| 71 | ) |
|
70 | ) | |
| 72 |
|
71 | |||
|
|
72 | sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib, | |||
|
|
73 | include_directories : gui_inc, | |||
|
|
74 | dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core]) | |||
|
|
75 | ||||
| @@ -49,9 +49,8 sciqlop_amdaplugin = library('amdaplugin', | |||||
| 49 | amdaplugin_rcc_plugin_files, |
|
49 | amdaplugin_rcc_plugin_files, | |
| 50 | amdaplugin_moc_plugin_files, |
|
50 | amdaplugin_moc_plugin_files, | |
| 51 | cpp_args : ['-DAMDA_LIB','-DQT_PLUGIN'], |
|
51 | cpp_args : ['-DAMDA_LIB','-DQT_PLUGIN'], | |
| 52 | link_with : [sciqlop_core, sciqlop_gui], |
|
52 | include_directories : [amdaplugin_inc], | |
| 53 |
|
|
53 | dependencies : [sciqlop_core, sciqlop_gui], | |
| 54 | dependencies : [qt5core, qt5gui, qt5widgets, qt5network], |
|
|||
| 55 | install : true |
|
54 | install : true | |
| 56 | ) |
|
55 | ) | |
| 57 |
|
56 | |||
| @@ -65,9 +64,9 tests = [ | |||||
| 65 | foreach unit_test : tests |
|
64 | foreach unit_test : tests | |
| 66 | test_moc_files = qt5.preprocess(moc_sources : unit_test[0]) |
|
65 | test_moc_files = qt5.preprocess(moc_sources : unit_test[0]) | |
| 67 | test_exe = executable(unit_test[1],unit_test[0] , test_moc_files, |
|
66 | test_exe = executable(unit_test[1],unit_test[0] , test_moc_files, | |
| 68 |
link_with : [sciqlop_ |
|
67 | link_with : [sciqlop_amdaplugin], | |
| 69 |
include_directories : [ |
|
68 | include_directories : [amdaplugin_inc], | |
| 70 | cpp_args : ['-DAMDA_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'], |
|
69 | cpp_args : ['-DAMDA_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'], | |
| 71 |
dependencies : [ |
|
70 | dependencies : [sciqlop_core, sciqlop_gui, qt5test]) | |
| 72 | test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60) |
|
71 | test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60) | |
| 73 | endforeach |
|
72 | endforeach | |
| @@ -25,9 +25,8 sciqlop_mockplugin = library('mockplugin', | |||||
| 25 | mockplugin_sources, |
|
25 | mockplugin_sources, | |
| 26 | mockplugin_moc_files, |
|
26 | mockplugin_moc_files, | |
| 27 | cpp_args : '-DMOCKPLUGIN_LIB', |
|
27 | cpp_args : '-DMOCKPLUGIN_LIB', | |
| 28 |
|
|
28 | include_directories : [mockplugin_inc], | |
| 29 |
|
|
29 | dependencies : [sciqlop_core, sciqlop_gui], | |
| 30 | dependencies : [qt5core, qt5gui, qt5widgets, qt5network], |
|
|||
| 31 | install : true |
|
30 | install : true | |
| 32 | ) |
|
31 | ) | |
| 33 |
|
32 | |||
General Comments 0
You need to be logged in to leave comments.
Login now