| @@ -41,7 +41,7 core_sources = [ | |||
|
|
41 | 41 | 'src/DataSource/DataSourceItemAction.cpp', |
|
|
42 | 42 | 'src/DataSource/DataSourceItemMergeHelper.cpp', |
|
|
43 | 43 | 'src/Network/NetworkController.cpp', |
|
|
44 | 'src/Plugin/PluginManager.cpp', | |
|
|
44 | 'src/PluginManager/PluginManager.cpp', | |
|
|
45 | 45 | 'src/Settings/SqpSettingsDefs.cpp', |
|
|
46 | 46 | 'src/Time/TimeController.cpp', |
|
|
47 | 47 | 'src/Variable/Variable.cpp', |
| @@ -53,7 +53,7 core_sources = [ | |||
|
|
53 | 53 | 'src/Visualization/VisualizationController.cpp' |
|
|
54 | 54 | ] |
|
|
55 | 55 | |
|
|
56 |
core_inc = include_directories(['include', ' |
|
|
|
56 | core_inc = include_directories(['include', 'include/Plugin']) | |
|
|
57 | 57 | |
|
|
58 | 58 | sciqlop_core_lib = library('sciqlopcore', |
|
|
59 | 59 | core_sources, |
| @@ -5,6 +5,15 FILE (GLOB_RECURSE amdaplugin_SRCS | |||
|
|
5 | 5 | resources/*.qrc |
|
|
6 | 6 | ) |
|
|
7 | 7 | |
|
|
8 | ||
|
|
9 | set(AMDA_server_type hybrid CACHE STRING "AMDA server type selected at CMake configure time") | |
|
|
10 | ||
|
|
11 | set(AMDA_SERVER_TYPE "hybrid;amdatest;localhost" CACHE STRING | |
|
|
12 | "List of possible for AMDA server type") | |
|
|
13 | ||
|
|
14 | set_property(CACHE AMDA_server_type PROPERTY STRINGS ${AMDA_SERVER_TYPE}) | |
|
|
15 | add_definitions(-DSCIQLOP_AMDA_SERVER="{AMDA_server_type}") | |
|
|
16 | ||
|
|
8 | 17 | add_definitions(-DQT_PLUGIN) |
|
|
9 | 18 | add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/amda.json") |
|
|
10 | 19 | if(NOT BUILD_SHARED_LIBS) |
| @@ -28,4 +37,4 add_definitions(-DAMDA_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-reso | |||
|
|
28 | 37 | declare_test(TestAmdaParser TestAmdaParser tests/TestAmdaParser.cpp "amdaplugin;Qt5::Test") |
|
|
29 | 38 | declare_test(TestAmdaResultParser TestAmdaResultParser tests/TestAmdaResultParser.cpp "amdaplugin;Qt5::Test") |
|
|
30 | 39 | declare_test(TestAmdaAcquisition TestAmdaAcquisition tests/TestAmdaAcquisition.cpp "amdaplugin;Qt5::Test") |
|
|
31 | ||
|
|
40 | declare_test(TestAmdaFuzzing TestAmdaFuzzing "tests/TestAmdaFuzzing.cpp;tests/FuzzingValidators.cpp;tests/FuzzingUtils.cpp;tests/FuzzingOperations.cpp;tests/FuzzingDefs.cpp" "amdaplugin;Qt5::Test") | |
| @@ -20,14 +20,14 amdaplugin_resources_files = [ | |||
|
|
20 | 20 | 'resources/amdaresources.qrc' |
|
|
21 | 21 | ] |
|
|
22 | 22 | |
|
|
23 |
amdaplugin_inc = include_directories(['include' |
|
|
|
23 | amdaplugin_inc = include_directories(['include']) | |
|
|
24 | 24 | |
|
|
25 | 25 | moc_gen = generator(moc, |
|
|
26 | 26 | output : 'moc_@BASENAME@.cpp', |
|
|
27 | 27 | arguments : ['@INPUT@', |
|
|
28 | 28 | '-DSCIQLOP_PLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"', |
|
|
29 | 29 | '-I', meson.current_source_dir()+'/include', |
|
|
30 |
'-I', meson.current_source_dir()+'/../../ |
|
|
|
30 | '-I', meson.current_source_dir()+'/../../core/include/', | |
|
|
31 | 31 | '-o', '@OUTPUT@']) |
|
|
32 | 32 | |
|
|
33 | 33 | rcc_gen = generator(rcc, |
| @@ -9,7 +9,7 mockplugin_sources = [ | |||
|
|
9 | 9 | 'src/MockPlugin.cpp' |
|
|
10 | 10 | ] |
|
|
11 | 11 | |
|
|
12 |
mockplugin_inc = include_directories(['include' |
|
|
|
12 | mockplugin_inc = include_directories(['include']) | |
|
|
13 | 13 | |
|
|
14 | 14 | |
|
|
15 | 15 | gen = generator(moc, |
| @@ -17,7 +17,7 gen = generator(moc, | |||
|
|
17 | 17 | arguments : ['@INPUT@', |
|
|
18 | 18 | '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/mockplugin/resources/mockplugin.json"', |
|
|
19 | 19 | '-I', meson.current_source_dir()+'/include', |
|
|
20 |
'-I', meson.current_source_dir()+'/../../ |
|
|
|
20 | '-I', meson.current_source_dir()+'/../../core/include/', | |
|
|
21 | 21 | '-o', '@OUTPUT@']) |
|
|
22 | 22 | |
|
|
23 | 23 | mockplugin_moc_files = gen.process(mockplugin_moc_headers) |
| @@ -43,4 +43,4 foreach unit_test : tests | |||
|
|
43 | 43 | cpp_args : ['-DMOCKPLUGIN_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'], |
|
|
44 | 44 | dependencies : [sciqlop_core, sciqlop_gui, qt5test]) |
|
|
45 | 45 | test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60) |
|
|
46 | endforeach No newline at end of file | |
|
|
46 | endforeach | |
General Comments 0
You need to be logged in to leave comments.
Login now