From 701d46d701bb2826a6e62c04be93aea193b1e7dd 2019-01-20 17:55:22 From: Alexis Jeandet Date: 2019-01-20 17:55:22 Subject: [PATCH] Mingw build fix Signed-off-by: Alexis Jeandet --- diff --git a/core b/core index b615898..31aa993 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b6158986222b7f9327317f3d29bf51d30cb70cbd +Subproject commit 31aa9931cd223e08c52607aba1afcb3b72ab020f diff --git a/plugins/amda/CMakeLists.txt b/plugins/amda/CMakeLists.txt index d359635..fb127f8 100644 --- a/plugins/amda/CMakeLists.txt +++ b/plugins/amda/CMakeLists.txt @@ -43,6 +43,9 @@ declare_test(TestAmdaFuzzing TestAmdaFuzzing "tests/TestAmdaFuzzing.cpp;tests/Fu if(PyWrappers) + if(MINGW) + add_definitions(-D_hypot=hypot) + endif() pybind11_add_module(pytestamda tests/PyTestAmdaWrapper.cpp) target_link_libraries(pytestamda PUBLIC amdaplugin) target_link_libraries(pytestamda PUBLIC pysciqlop) diff --git a/plugins/mockplugin/CMakeLists.txt b/plugins/mockplugin/CMakeLists.txt index d5e6890..57f5504 100644 --- a/plugins/mockplugin/CMakeLists.txt +++ b/plugins/mockplugin/CMakeLists.txt @@ -28,6 +28,9 @@ add_definitions(-DMOCKPLUGIN_LIB) #declare_test(TestCosinusAcquisition TestCosinusAcquisition tests/TestCosinusAcquisition.cpp "mockplugin;Qt5::Test") if(PyWrappers) + if(MINGW) + add_definitions(-D_hypot=hypot) + endif() pybind11_add_module(pytestmockplugin tests/PyTestMockPluginWrapper.cpp) target_link_libraries(pytestmockplugin PUBLIC mockplugin) target_link_libraries(pytestmockplugin PUBLIC pysciqlop)