From d2b92bff55253c72e8e679214404483b7288f1ee Mon Sep 17 00:00:00 2001 From: xhbuming <1009459330@qq.com> Date: Wed, 24 Jun 2020 04:01:52 +0800 Subject: [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 --- ports/cjson/CONTROL | 2 +- ports/cjson/portfile.cmake | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3