##// END OF EJS Templates
Added option to disable PB11 wrappers...
jeandet -
r1380:a419c80b28cd
parent child
Show More
@@ -1,1 +1,1
1 Subproject commit 79fb0ced05d752f6e9260afddb38cc0d50e80c6d
1 Subproject commit 65c558a3025bc4ab1701c51a15427ccbf9d86cd3
@@ -1,84 +1,88
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
16
17 add_definitions(-DQT_PLUGIN)
17 add_definitions(-DQT_PLUGIN)
18 add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/amda.json")
18 add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/amda.json")
19 if(NOT BUILD_SHARED_LIBS)
19 if(NOT BUILD_SHARED_LIBS)
20 add_definitions(-DQT_STATICPLUGIN)
20 add_definitions(-DQT_STATICPLUGIN)
21 endif()
21 endif()
22
22
23 add_library(amdaplugin ${amdaplugin_SRCS})
23 add_library(amdaplugin ${amdaplugin_SRCS})
24 SET_TARGET_PROPERTIES(amdaplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
24 SET_TARGET_PROPERTIES(amdaplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
25
25
26 target_link_libraries(amdaplugin PUBLIC sciqlopgui)
26 target_link_libraries(amdaplugin PUBLIC sciqlopgui)
27
27
28 install(TARGETS amdaplugin
28 install(TARGETS amdaplugin
29 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
29 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
30 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
30 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
31 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
31 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
32
32
33 include(sciqlop_tests)
33 include(sciqlop_tests)
34
34
35 add_definitions(-DAMDA_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
35 add_definitions(-DAMDA_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
36
36
37 declare_test(TestAmdaParser TestAmdaParser tests/TestAmdaParser.cpp "amdaplugin;Qt5::Test")
37 declare_test(TestAmdaParser TestAmdaParser tests/TestAmdaParser.cpp "amdaplugin;Qt5::Test")
38 declare_test(TestAmdaResultParser TestAmdaResultParser tests/TestAmdaResultParser.cpp "amdaplugin;Qt5::Test")
38 declare_test(TestAmdaResultParser TestAmdaResultParser tests/TestAmdaResultParser.cpp "amdaplugin;Qt5::Test")
39 declare_test(TestAmdaAcquisition TestAmdaAcquisition tests/TestAmdaAcquisition.cpp "amdaplugin;Qt5::Test")
39 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")
40 declare_test(TestAmdaFuzzing TestAmdaFuzzing "tests/TestAmdaFuzzing.cpp;tests/FuzzingValidators.cpp;tests/FuzzingUtils.cpp;tests/FuzzingOperations.cpp;tests/FuzzingDefs.cpp" "amdaplugin;Qt5::Test")
41
41
42 pybind11_add_module(pytestamda tests/PyTestAmdaWrapper.cpp)
43 target_link_libraries(pytestamda PUBLIC amdaplugin)
44 target_link_libraries(pytestamda PUBLIC pysciqlop)
45
42
43 if(PyWrappers)
44 pybind11_add_module(pytestamda tests/PyTestAmdaWrapper.cpp)
45 target_link_libraries(pytestamda PUBLIC amdaplugin)
46 target_link_libraries(pytestamda PUBLIC pysciqlop)
46
47
47 #pybind11_add_module(pytestamdalib SHARED tests/PyTestAmdaWrapper.cpp)
48 add_library(pytestamdalib tests/PyTestAmdaWrapper.cpp)
49 target_link_libraries(pytestamdalib PUBLIC pybind11::module)
50 target_link_libraries(pytestamdalib PUBLIC pybind11::embed)
51 target_link_libraries(pytestamdalib PUBLIC amdaplugin)
52 target_link_libraries(pytestamdalib PUBLIC pysciqlop)
53
48
54 GET_PROPERTY(CORE_PYTHON_PATH GLOBAL PROPERTY CORE_PYTHON_PATH)
49 #pybind11_add_module(pytestamdalib SHARED tests/PyTestAmdaWrapper.cpp)
50 add_library(pytestamdalib tests/PyTestAmdaWrapper.cpp)
51 target_link_libraries(pytestamdalib PUBLIC pybind11::module)
52 target_link_libraries(pytestamdalib PUBLIC pybind11::embed)
53 target_link_libraries(pytestamdalib PUBLIC amdaplugin)
54 target_link_libraries(pytestamdalib PUBLIC pysciqlop)
55
55
56 declare_test(TestAmdaFileParserEmbed TestAmdaFileParserEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
56 GET_PROPERTY(CORE_PYTHON_PATH GLOBAL PROPERTY CORE_PYTHON_PATH)
57 target_compile_definitions(TestAmdaFileParserEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py")
58 set_tests_properties(TestAmdaFileParserEmbed PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
59
57
58 declare_test(TestAmdaFileParserEmbed TestAmdaFileParserEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
59 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})
60
61
61 declare_test(TestAmdaDownloadEmbed TestAmdaDownloadEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
62 target_compile_definitions(TestAmdaDownloadEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py")
63 set_tests_properties(TestAmdaDownloadEmbed PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
64
62
63 declare_test(TestAmdaDownloadEmbed TestAmdaDownloadEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
64 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})
65
66
66 declare_test(TestAmdaMiniFuzzEmbed TestAmdaMiniFuzzEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
67 target_compile_definitions(TestAmdaMiniFuzzEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaMiniFuzz.py")
68 set_tests_properties(TestAmdaMiniFuzzEmbed PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
69
67
68 declare_test(TestAmdaMiniFuzzEmbed TestAmdaMiniFuzzEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
69 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})
70
71
71 find_package(PythonInterp 3 REQUIRED)
72
72
73 add_test(NAME TestAmdaFileParser
73 find_package(PythonInterp 3 REQUIRED)
74 COMMAND ${PYTHON_EXECUTABLE}
75 ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py
76 TestAmdaFileParser)
77 set_tests_properties(TestAmdaFileParser PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
78
74
75 add_test(NAME TestAmdaFileParser
76 COMMAND ${PYTHON_EXECUTABLE}
77 ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py
78 TestAmdaFileParser)
79 set_tests_properties(TestAmdaFileParser PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
79
80
80 add_test(NAME TestAmdaDownload
81
81 COMMAND ${PYTHON_EXECUTABLE}
82 add_test(NAME TestAmdaDownload
82 ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py
83 COMMAND ${PYTHON_EXECUTABLE}
83 TestAmdaDownload)
84 ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py
84 set_tests_properties(TestAmdaDownload PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
85 TestAmdaDownload)
86 set_tests_properties(TestAmdaDownload PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
87
88 endif(PyWrappers)
@@ -1,31 +1,33
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
27
28 #declare_test(TestCosinusAcquisition TestCosinusAcquisition tests/TestCosinusAcquisition.cpp "mockplugin;Qt5::Test")
28 #declare_test(TestCosinusAcquisition TestCosinusAcquisition tests/TestCosinusAcquisition.cpp "mockplugin;Qt5::Test")
29 pybind11_add_module(pytestmockplugin tests/PyTestMockPluginWrapper.cpp)
29 if(PyWrappers)
30 target_link_libraries(pytestmockplugin PUBLIC mockplugin)
30 pybind11_add_module(pytestmockplugin tests/PyTestMockPluginWrapper.cpp)
31 target_link_libraries(pytestmockplugin PUBLIC pysciqlop)
31 target_link_libraries(pytestmockplugin PUBLIC mockplugin)
32 target_link_libraries(pytestmockplugin PUBLIC pysciqlop)
33 endif()
General Comments 0
You need to be logged in to leave comments. Login now