Merge branch 'master' into fix_comparison_warning

This commit is contained in:
Jordan Bayles 2024-12-02 23:19:42 -08:00 committed by GitHub
commit 04778f3a48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -143,7 +143,7 @@ if(BUILD_STATIC_LIBS)
# avoid name clashes on windows as the shared import lib is also named jsoncpp.lib # 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(NOT DEFINED STATIC_SUFFIX AND BUILD_SHARED_LIBS)
if (WIN32) if (MSVC OR ("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC"))
set(STATIC_SUFFIX "_static") set(STATIC_SUFFIX "_static")
else() else()
set(STATIC_SUFFIX "") set(STATIC_SUFFIX "")