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