-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
jsoncpp: correct name of static library
- Loading branch information
Showing
2 changed files
with
33 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
Append suffix to static library name only for MSVC. | ||
|
||
diff -urN jsoncpp-1.9.6/src/lib_json/CMakeLists.txt.orig jsoncpp-1.9.6/src/lib_json/CMakeLists.txt | ||
--- jsoncpp-1.9.6/src/lib_json/CMakeLists.txt.orig 2024-09-10 05:18:29.000000000 +0200 | ||
+++ jsoncpp-1.9.6/src/lib_json/CMakeLists.txt 2024-11-19 14:07:18.639721600 +0100 | ||
@@ -143,7 +143,7 @@ | ||
|
||
# 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) | ||
set(STATIC_SUFFIX "_static") | ||
else() | ||
set(STATIC_SUFFIX "") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters