diff --git a/ports/cjson/CONTROL b/ports/cjson/CONTROL index f8eada28b..51557451e 100644 --- a/ports/cjson/CONTROL +++ b/ports/cjson/CONTROL @@ -1,6 +1,7 @@ Source: cjson -Version: 1.7.12 +Version: 2019-11-30 Description: Ultralightweight JSON parser in ANSI C +Homepage: https://github.com/DaveGamble/cJSON Feature: utils Description: Enable building the cJSON_Utils library diff --git a/ports/cjson/fix-install-path.patch b/ports/cjson/fix-install-path.patch deleted file mode 100644 index 96a65d996..000000000 --- a/ports/cjson/fix-install-path.patch +++ /dev/null @@ -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() diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake index 753c4ed2a..eefb66659 100644 --- a/ports/cjson/portfile.cmake +++ b/ports/cjson/portfile.cmake @@ -3,18 +3,15 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DaveGamble/cJSON - REF v1.7.12 - SHA512 d767b7261eff3a1a50ea46cc5573f9504f5734a891ea211ad348835bfb4b80acf7f744da2d34bb1fa270cd4d44576c21bc6f52c0604b7e6ffdeb61ecb396b376 + REF 95368da1a13c1ced5507bb5b0a457729af34837c + SHA512 e50fb7857573fac39bc9659004bd71483156677b4b1c7dd801470469162d1af2b1e3803fb4f1291b2b5defefb005ddd78b0efb01965626eecc00bc78b5f98c72 HEAD_REF master - PATCHES - fix-install-path.patch ) -if("utils" IN_LIST FEATURES) - set(ENABLE_CJSON_UTILS ON) -else() - set(ENABLE_CJSON_UTILS OFF) -endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + utils ENABLE_CJSON_UTILS +) if(CMAKE_HOST_WIN32) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_PUBLIC_SYMBOLS) @@ -30,9 +27,9 @@ vcpkg_configure_cmake( -DCJSON_OVERRIDE_BUILD_SHARED_LIBS=OFF -DENABLE_PUBLIC_SYMBOLS=${ENABLE_PUBLIC_SYMBOLS} -DENABLE_TARGET_EXPORT=ON # Export CMake config files - -DENABLE_CJSON_UTILS=${ENABLE_CJSON_UTILS} -DENABLE_CJSON_TEST=OFF -DENABLE_FUZZING=OFF + ${FEATURE_OPTIONS} ) vcpkg_install_cmake()