aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxhbuming <1009459330@qq.com>2020-06-24 04:01:52 +0800
committerGitHub <noreply@github.com>2020-06-23 13:01:52 -0700
commitd2b92bff55253c72e8e679214404483b7288f1ee (patch)
tree71583a31d39913a7b3855dcb16d1b6efa43c9ba8
parent85f453a8a4f6814080d898f777816aac15782ba9 (diff)
downloadvcpkg-d2b92bff55253c72e8e679214404483b7288f1ee.tar.gz
vcpkg-d2b92bff55253c72e8e679214404483b7288f1ee.zip
[cjson] fix windows-static for don't export symbols (#12026)
* fix windows-static for don't export symbols /* export symbols by default, this is necessary for copy pasting the C and header file */ #if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS) #define CJSON_EXPORT_SYMBOLS #endif * Update CONTROL
-rw-r--r--ports/cjson/CONTROL2
-rw-r--r--ports/cjson/portfile.cmake3
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/cjson/CONTROL b/ports/cjson/CONTROL
index 51557451e..27474316a 100644
--- a/ports/cjson/CONTROL
+++ b/ports/cjson/CONTROL
@@ -1,5 +1,5 @@
Source: cjson
-Version: 2019-11-30
+Version: 2019-11-30-1
Description: Ultralightweight JSON parser in ANSI C
Homepage: https://github.com/DaveGamble/cJSON
diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake
index eefb66659..8332562f0 100644
--- a/ports/cjson/portfile.cmake
+++ b/ports/cjson/portfile.cmake
@@ -15,8 +15,10 @@ vcpkg_check_features(
if(CMAKE_HOST_WIN32)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_PUBLIC_SYMBOLS)
+ string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DENABLE_HIDDEN_SYMBOLS)
else()
set(ENABLE_PUBLIC_SYMBOLS OFF)
+ set(DENABLE_HIDDEN_SYMBOLS OFF)
endif()
vcpkg_configure_cmake(
@@ -26,6 +28,7 @@ vcpkg_configure_cmake(
-DBUILD_SHARED_AND_STATIC_LIBS=OFF
-DCJSON_OVERRIDE_BUILD_SHARED_LIBS=OFF
-DENABLE_PUBLIC_SYMBOLS=${ENABLE_PUBLIC_SYMBOLS}
+ -DENABLE_HIDDEN_SYMBOLS=${DENABLE_HIDDEN_SYMBOLS}
-DENABLE_TARGET_EXPORT=ON # Export CMake config files
-DENABLE_CJSON_TEST=OFF
-DENABLE_FUZZING=OFF