##// END OF EJS Templates
Fix Win build
jeandet -
r1389:80acb196a347
parent child
Show More
@@ -1,1 +1,1
1 Subproject commit 139d5f0a7d64d6d6d1d20862d922cada26ed8df3
1 Subproject commit 5da81c9656ecee14a148854699c97556f22c63aa
@@ -1,88 +1,90
1 include_directories(include)
1 include_directories(include)
2 FILE (GLOB_RECURSE amdaplugin_SRCS
2 FILE (GLOB_RECURSE amdaplugin_SRCS
3 include/*.h
3 include/*.h
4 src/*.cpp
4 src/*.cpp
5 resources/*.qrc
5 resources/*.qrc
6 )
6 )
7
7
8
8
9 set(AMDA_server_type hybrid CACHE STRING "AMDA server type selected at CMake configure time")
9 set(AMDA_server_type hybrid CACHE STRING "AMDA server type selected at CMake configure time")
10
10
11 set(AMDA_SERVER_TYPE "hybrid;amdatest;localhost" CACHE STRING
11 set(AMDA_SERVER_TYPE "hybrid;amdatest;localhost" CACHE STRING
12 "List of possible for AMDA server type")
12 "List of possible for AMDA server type")
13
13
14 set_property(CACHE AMDA_server_type PROPERTY STRINGS ${AMDA_SERVER_TYPE})
14 set_property(CACHE AMDA_server_type PROPERTY STRINGS ${AMDA_SERVER_TYPE})
15 add_definitions(-DSCIQLOP_AMDA_SERVER="${AMDA_server_type}")
15 add_definitions(-DSCIQLOP_AMDA_SERVER="${AMDA_server_type}")
16 add_definitions(-DAMDAPLUGIN_LIB)
17 add_definitions(-DAMDA_LIB)
16
18
17 add_definitions(-DQT_PLUGIN)
19 add_definitions(-DQT_PLUGIN)
18 add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/amda.json")
20 add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/amda.json")
19 if(NOT BUILD_SHARED_LIBS)
21 if(NOT BUILD_SHARED_LIBS)
20 add_definitions(-DQT_STATICPLUGIN)
22 add_definitions(-DQT_STATICPLUGIN)
21 endif()
23 endif()
22
24
23 add_library(amdaplugin ${amdaplugin_SRCS})
25 add_library(amdaplugin ${amdaplugin_SRCS})
24 SET_TARGET_PROPERTIES(amdaplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
26 SET_TARGET_PROPERTIES(amdaplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
25
27
26 target_link_libraries(amdaplugin PUBLIC sciqlopgui)
28 target_link_libraries(amdaplugin PUBLIC sciqlopgui)
27
29
28 install(TARGETS amdaplugin
30 install(TARGETS amdaplugin
29 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
31 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
30 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
32 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
31 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
33 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
32
34
33 include(sciqlop_tests)
35 include(sciqlop_tests)
34
36
35 add_definitions(-DAMDA_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
37 add_definitions(-DAMDA_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
36
38
37 declare_test(TestAmdaParser TestAmdaParser tests/TestAmdaParser.cpp "amdaplugin;Qt5::Test")
39 declare_test(TestAmdaParser TestAmdaParser tests/TestAmdaParser.cpp "amdaplugin;Qt5::Test")
38 declare_test(TestAmdaResultParser TestAmdaResultParser tests/TestAmdaResultParser.cpp "amdaplugin;Qt5::Test")
40 declare_test(TestAmdaResultParser TestAmdaResultParser tests/TestAmdaResultParser.cpp "amdaplugin;Qt5::Test")
39 declare_test(TestAmdaAcquisition TestAmdaAcquisition tests/TestAmdaAcquisition.cpp "amdaplugin;Qt5::Test")
41 declare_test(TestAmdaAcquisition TestAmdaAcquisition tests/TestAmdaAcquisition.cpp "amdaplugin;Qt5::Test")
40 declare_test(TestAmdaFuzzing TestAmdaFuzzing "tests/TestAmdaFuzzing.cpp;tests/FuzzingValidators.cpp;tests/FuzzingUtils.cpp;tests/FuzzingOperations.cpp;tests/FuzzingDefs.cpp" "amdaplugin;Qt5::Test")
42 declare_test(TestAmdaFuzzing TestAmdaFuzzing "tests/TestAmdaFuzzing.cpp;tests/FuzzingValidators.cpp;tests/FuzzingUtils.cpp;tests/FuzzingOperations.cpp;tests/FuzzingDefs.cpp" "amdaplugin;Qt5::Test")
41
43
42
44
43 if(PyWrappers)
45 if(PyWrappers)
44 pybind11_add_module(pytestamda tests/PyTestAmdaWrapper.cpp)
46 pybind11_add_module(pytestamda tests/PyTestAmdaWrapper.cpp)
45 target_link_libraries(pytestamda PUBLIC amdaplugin)
47 target_link_libraries(pytestamda PUBLIC amdaplugin)
46 target_link_libraries(pytestamda PUBLIC pysciqlop)
48 target_link_libraries(pytestamda PUBLIC pysciqlop)
47
49
48
50
49 #pybind11_add_module(pytestamdalib SHARED tests/PyTestAmdaWrapper.cpp)
51 #pybind11_add_module(pytestamdalib SHARED tests/PyTestAmdaWrapper.cpp)
50 add_library(pytestamdalib tests/PyTestAmdaWrapper.cpp)
52 add_library(pytestamdalib tests/PyTestAmdaWrapper.cpp)
51 target_link_libraries(pytestamdalib PUBLIC pybind11::module)
53 target_link_libraries(pytestamdalib PUBLIC pybind11::module)
52 target_link_libraries(pytestamdalib PUBLIC pybind11::embed)
54 target_link_libraries(pytestamdalib PUBLIC pybind11::embed)
53 target_link_libraries(pytestamdalib PUBLIC amdaplugin)
55 target_link_libraries(pytestamdalib PUBLIC amdaplugin)
54 target_link_libraries(pytestamdalib PUBLIC pysciqlop)
56 target_link_libraries(pytestamdalib PUBLIC pysciqlop)
55
57
56 GET_PROPERTY(CORE_PYTHON_PATH GLOBAL PROPERTY CORE_PYTHON_PATH)
58 GET_PROPERTY(CORE_PYTHON_PATH GLOBAL PROPERTY CORE_PYTHON_PATH)
57
59
58 declare_test(TestAmdaFileParserEmbed TestAmdaFileParserEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
60 declare_test(TestAmdaFileParserEmbed TestAmdaFileParserEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
59 target_compile_definitions(TestAmdaFileParserEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py")
61 target_compile_definitions(TestAmdaFileParserEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py")
60 set_tests_properties(TestAmdaFileParserEmbed PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
62 set_tests_properties(TestAmdaFileParserEmbed PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
61
63
62
64
63 declare_test(TestAmdaDownloadEmbed TestAmdaDownloadEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
65 declare_test(TestAmdaDownloadEmbed TestAmdaDownloadEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
64 target_compile_definitions(TestAmdaDownloadEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py")
66 target_compile_definitions(TestAmdaDownloadEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py")
65 set_tests_properties(TestAmdaDownloadEmbed PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
67 set_tests_properties(TestAmdaDownloadEmbed PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
66
68
67
69
68 declare_test(TestAmdaMiniFuzzEmbed TestAmdaMiniFuzzEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
70 declare_test(TestAmdaMiniFuzzEmbed TestAmdaMiniFuzzEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
69 target_compile_definitions(TestAmdaMiniFuzzEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaMiniFuzz.py")
71 target_compile_definitions(TestAmdaMiniFuzzEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaMiniFuzz.py")
70 set_tests_properties(TestAmdaMiniFuzzEmbed PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
72 set_tests_properties(TestAmdaMiniFuzzEmbed PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
71
73
72
74
73 find_package(PythonInterp 3 REQUIRED)
75 find_package(PythonInterp 3 REQUIRED)
74
76
75 add_test(NAME TestAmdaFileParser
77 add_test(NAME TestAmdaFileParser
76 COMMAND ${PYTHON_EXECUTABLE}
78 COMMAND ${PYTHON_EXECUTABLE}
77 ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py
79 ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py
78 TestAmdaFileParser)
80 TestAmdaFileParser)
79 set_tests_properties(TestAmdaFileParser PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
81 set_tests_properties(TestAmdaFileParser PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
80
82
81
83
82 add_test(NAME TestAmdaDownload
84 add_test(NAME TestAmdaDownload
83 COMMAND ${PYTHON_EXECUTABLE}
85 COMMAND ${PYTHON_EXECUTABLE}
84 ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py
86 ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py
85 TestAmdaDownload)
87 TestAmdaDownload)
86 set_tests_properties(TestAmdaDownload PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
88 set_tests_properties(TestAmdaDownload PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
87
89
88 endif(PyWrappers)
90 endif(PyWrappers)
@@ -1,24 +1,25
1 #ifndef GENERICWSPLUGIN_H
1 #ifndef GENERICWSPLUGIN_H
2 #define GENERICWSPLUGIN_H
2 #define GENERICWSPLUGIN_H
3
3
4 #include <Plugin/IPlugin.h>
4 #include <Plugin/IPlugin.h>
5
5
6
6
7 #include <memory>
7 #include <memory>
8
8
9 #ifndef SCIQLOP_PLUGIN_JSON_FILE_PATH
9 #ifndef SCIQLOP_PLUGIN_JSON_FILE_PATH
10 #define SCIQLOP_PLUGIN_JSON_FILE_PATH "genericWS.json"
10 #define SCIQLOP_PLUGIN_JSON_FILE_PATH "genericWS.json"
11 #endif
11 #endif
12
12
13 class DataSourceItem;
13 class DataSourceItem;
14
14
15 class GenericWS : public QObject, public IPlugin {
15 class GenericWS : public QObject, public IPlugin {
16 Q_OBJECT
16 Q_OBJECT
17 Q_INTERFACES(IPlugin)
17 Q_INTERFACES(IPlugin)
18 Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE SCIQLOP_PLUGIN_JSON_FILE_PATH)
18 Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE SCIQLOP_PLUGIN_JSON_FILE_PATH)
19 public:
19 public:
20 /// @sa IPlugin::initialize()
20 /// @sa IPlugin::initialize()
21 void initialize() override;
21 void initialize() override
22 {}
22 };
23 };
23
24
24 #endif // GENERICWSPLUGIN_H
25 #endif // GENERICWSPLUGIN_H
@@ -1,33 +1,34
1 include_directories(include)
1 include_directories(include)
2 FILE (GLOB_RECURSE mockplugin_SRCS
2 FILE (GLOB_RECURSE mockplugin_SRCS
3 include/*.h
3 include/*.h
4 src/*.cpp
4 src/*.cpp
5 resources/*.qrc
5 resources/*.qrc
6 )
6 )
7
7
8 add_definitions(-DQT_PLUGIN)
8 add_definitions(-DQT_PLUGIN)
9 add_definitions(-DPLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/mockplugin.json")
9 add_definitions(-DPLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/mockplugin.json")
10 if(NOT BUILD_SHARED_LIBS)
10 if(NOT BUILD_SHARED_LIBS)
11 add_definitions(-DQT_STATICPLUGIN)
11 add_definitions(-DQT_STATICPLUGIN)
12 endif()
12 endif()
13
13
14 add_library(mockplugin ${mockplugin_SRCS})
14 add_library(mockplugin ${mockplugin_SRCS})
15 SET_TARGET_PROPERTIES(mockplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
15 SET_TARGET_PROPERTIES(mockplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
16
16
17 target_link_libraries(mockplugin sciqlopgui)
17 target_link_libraries(mockplugin sciqlopgui)
18
18
19 install(TARGETS mockplugin
19 install(TARGETS mockplugin
20 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
20 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
21 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
21 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
22 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
22 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
23
23
24 include(sciqlop_tests)
24 include(sciqlop_tests)
25
25
26 add_definitions(-DMOCKPLUGIN_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
26 add_definitions(-DMOCKPLUGIN_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
27 add_definitions(-DMOCKPLUGIN_LIB)
27
28
28 #declare_test(TestCosinusAcquisition TestCosinusAcquisition tests/TestCosinusAcquisition.cpp "mockplugin;Qt5::Test")
29 #declare_test(TestCosinusAcquisition TestCosinusAcquisition tests/TestCosinusAcquisition.cpp "mockplugin;Qt5::Test")
29 if(PyWrappers)
30 if(PyWrappers)
30 pybind11_add_module(pytestmockplugin tests/PyTestMockPluginWrapper.cpp)
31 pybind11_add_module(pytestmockplugin tests/PyTestMockPluginWrapper.cpp)
31 target_link_libraries(pytestmockplugin PUBLIC mockplugin)
32 target_link_libraries(pytestmockplugin PUBLIC mockplugin)
32 target_link_libraries(pytestmockplugin PUBLIC pysciqlop)
33 target_link_libraries(pytestmockplugin PUBLIC pysciqlop)
33 endif()
34 endif()
General Comments 0
You need to be logged in to leave comments. Login now