cmake: Fix detection of MSVC-like compilers

saprykin · Apr 21, 2024 · 2fd4254 · 2fd4254
1 parent 8b8fd2f
commit 2fd4254
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -806,7 +806,7 @@ set (CMAKE_REQUIRED_LIBRARIES ${SAVED_CMAKE_REQUIRED_LIBRARIES})
 set (SAVED_CMAKE_REQUIRED_FLAGS ${SAVED_CMAKE_REQUIRED_FLAGS})
 
 # Disable useless warnings
-if (PLIBSYS_C_COMPILER STREQUAL msvc OR CMAKE_C_SIMULATE_ID STREQUAL MSVC)
+if (PLIBSYS_C_COMPILER STREQUAL msvc OR "x${CMAKE_C_SIMULATE_ID}" STREQUAL xMSVC)
  list (APPEND PLIBSYS_COMPILE_DEFS -D_CRT_SECURE_NO_WARNINGS)
  list (APPEND PLIBSYS_COMPILE_DEFS -D_WINSOCK_DEPRECATED_NO_WARNINGS)
 endif()

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -30,7 +30,7 @@ plibsys_detect_target_os (PLIBSYS_TESTS_TARGET_OS)
 list (APPEND PLIBSYS_TEST_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/../src)
 list (APPEND PLIBSYS_TEST_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/../src)
 
-if (MSVC OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)
+if (MSVC OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL xMSVC)
  list (APPEND PLIBSYS_TEST_COMPILE_DEFS -D_CRT_SECURE_NO_WARNINGS)
 endif()