The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[cjson] Update to 2019-11-30 (#9157)

Browse Source
This commit is contained in:
myd7349 2019-12-03 02:39:21 +08:00 committed by Griffin Downs
parent 55f2bbc8a3
commit c89f944b1d
3 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/cjson/CONTROL
View File

@ -1,6 +1,7 @@
Source: cjson Source: cjson
Version: 1.7.12 Version: 2019-11-30
Description: Ultralightweight JSON parser in ANSI C Description: Ultralightweight JSON parser in ANSI C
Homepage: https://github.com/DaveGamble/cJSON
Feature: utils Feature: utils
Description: Enable building the cJSON_Utils library Description: Enable building the cJSON_Utils library

34
ports/cjson/fix-install-path.patch
View File

@ -1,34 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 033a882..6e2b2e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,7 +149,13 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in"
install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson")
install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
-install(TARGETS "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_LIB}")
+install(TARGETS "${CJSON_LIB}"
+ EXPORT "${CJSON_LIB}"
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+ INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
+)
if (BUILD_SHARED_AND_STATIC_LIBS)
install(TARGETS "${CJSON_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
endif()
@@ -186,7 +192,13 @@ if(ENABLE_CJSON_UTILS)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson_utils.pc.in"
"${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" @ONLY)
- install(TARGETS "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}")
+ install(TARGETS "${CJSON_UTILS_LIB}"
+ EXPORT "${CJSON_UTILS_LIB}"
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+ INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
+ )
if (BUILD_SHARED_AND_STATIC_LIBS)
install(TARGETS "${CJSON_UTILS_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
endif()

17
ports/cjson/portfile.cmake
View File

@ -3,18 +3,15 @@ include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO DaveGamble/cJSON REPO DaveGamble/cJSON
REF v1.7.12 REF 95368da1a13c1ced5507bb5b0a457729af34837c
SHA512 d767b7261eff3a1a50ea46cc5573f9504f5734a891ea211ad348835bfb4b80acf7f744da2d34bb1fa270cd4d44576c21bc6f52c0604b7e6ffdeb61ecb396b376 SHA512 e50fb7857573fac39bc9659004bd71483156677b4b1c7dd801470469162d1af2b1e3803fb4f1291b2b5defefb005ddd78b0efb01965626eecc00bc78b5f98c72
HEAD_REF master HEAD_REF master
PATCHES
fix-install-path.patch
) )
if("utils" IN_LIST FEATURES) vcpkg_check_features(
set(ENABLE_CJSON_UTILS ON) OUT_FEATURE_OPTIONS FEATURE_OPTIONS
else() utils ENABLE_CJSON_UTILS
set(ENABLE_CJSON_UTILS OFF) )
endif()
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_PUBLIC_SYMBOLS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_PUBLIC_SYMBOLS)
@ -30,9 +27,9 @@ vcpkg_configure_cmake(
-DCJSON_OVERRIDE_BUILD_SHARED_LIBS=OFF -DCJSON_OVERRIDE_BUILD_SHARED_LIBS=OFF
-DENABLE_PUBLIC_SYMBOLS=${ENABLE_PUBLIC_SYMBOLS} -DENABLE_PUBLIC_SYMBOLS=${ENABLE_PUBLIC_SYMBOLS}
-DENABLE_TARGET_EXPORT=ON # Export CMake config files -DENABLE_TARGET_EXPORT=ON # Export CMake config files
-DENABLE_CJSON_UTILS=${ENABLE_CJSON_UTILS}
-DENABLE_CJSON_TEST=OFF -DENABLE_CJSON_TEST=OFF
-DENABLE_FUZZING=OFF -DENABLE_FUZZING=OFF
${FEATURE_OPTIONS}
) )
vcpkg_install_cmake() vcpkg_install_cmake()