Merge branch 'master' into fix_comparison_warning

open-source-parsers · Dec 3, 2024 · 04778f3 · 04778f3
2 parents d2f141c + 3f86349
commit 04778f3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt
@@ -143,7 +143,7 @@ if(BUILD_STATIC_LIBS)
 
     # avoid name clashes on windows as the shared import lib is also named jsoncpp.lib
     if(NOT DEFINED STATIC_SUFFIX AND BUILD_SHARED_LIBS)
-        if (WIN32)
+        if (MSVC OR ("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC"))
             set(STATIC_SUFFIX "_static")
         else()
             set(STATIC_SUFFIX "")