fix MinGW building (#54)

DevToolsOrganization · Nov 16, 2023 · a2ce504 · a2ce504
1 parent 62a9ec8
commit a2ce504
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,9 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 if(WIN32)
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND ${CMAKE_BUILD_TYPE} STREQUAL "Release")
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+    endif()
 endif(WIN32)
 
 add_subdirectory("ResourceManager")

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
@@ -13,10 +13,8 @@ MESSAGE("_____________________ Copy Plotlylib to Tests step ____________________
 if(WIN32)
 file(COPY ${CMAKE_SOURCE_DIR}/plotly_maker/plotly-2.27.0.min.js DESTINATION
     ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/davis_htmls)
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 file(COPY ${CMAKE_SOURCE_DIR}/plotly_maker/plotly-2.27.0.min.js DESTINATION
     ${CMAKE_CURRENT_BINARY_DIR}/davis_htmls)
-endif()
 endif(WIN32)
 
 add_executable(${PROJECT_NAME}_plotly_tests PlotlyLibTest.cpp)

diff --git a/array_core/CMakeLists.txt b/array_core/CMakeLists.txt
@@ -4,7 +4,9 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 if(WIN32)
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND ${CMAKE_BUILD_TYPE} STREQUAL "Release")
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+    endif()
 endif(WIN32)
 set(SOURCE_FILES
     "../common_utils/common_utils.cpp"