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