[cjson] Updating to 1.7.15 (#20279)

* Update cjson to 1.7.15

Also removing deprecated cmake functions, quoting paths

* Run x-add-version

* Update ports/cjson/portfile.cmake

* Run x-add-version after latest commit

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
This commit is contained in:
misirlou-tg 2021-09-23 19:50:47 -05:00 committed by GitHub
parent 127ccb3c5e
commit 456894a8a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 16 deletions

View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DaveGamble/cJSON
REF 95368da1a13c1ced5507bb5b0a457729af34837c
SHA512 e50fb7857573fac39bc9659004bd71483156677b4b1c7dd801470469162d1af2b1e3803fb4f1291b2b5defefb005ddd78b0efb01965626eecc00bc78b5f98c72
REF v1.7.15
SHA512 0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124
HEAD_REF master
)
@ -20,9 +20,8 @@ else()
set(DENABLE_HIDDEN_SYMBOLS OFF)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_SHARED_AND_STATIC_LIBS=OFF
-DCJSON_OVERRIDE_BUILD_SHARED_LIBS=OFF
@ -34,18 +33,18 @@ vcpkg_configure_cmake(
${FEATURE_OPTIONS}
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cJSON)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cJSON)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
)
file(READ ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h _contents)
file(READ "${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h" _contents)
if(ENABLE_PUBLIC_SYMBOLS)
string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "0 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}")
string(REPLACE "defined(CJSON_EXPORT_SYMBOLS)" "0 /* defined(CJSON_EXPORT_SYMBOLS) */" _contents "${_contents}")
@ -53,7 +52,7 @@ if(ENABLE_PUBLIC_SYMBOLS)
else()
string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "1 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}")
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h "${_contents}")
file(WRITE "${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h" "${_contents}")
# Handle copyright
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)

View File

@ -1,9 +1,18 @@
{
"name": "cjson",
"version-date": "2019-11-30",
"port-version": 2,
"version": "1.7.15",
"description": "Ultralightweight JSON parser in ANSI C",
"homepage": "https://github.com/DaveGamble/cJSON",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"utils": {
"description": "Enable building the cJSON_Utils library"

View File

@ -1329,8 +1329,8 @@
"port-version": 0
},
"cjson": {
"baseline": "2019-11-30",
"port-version": 2
"baseline": "1.7.15",
"port-version": 0
},
"clamav": {
"baseline": "0.103.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4a0cbb7810d1e9fda06ff7da2f8deb5249401267",
"version": "1.7.15",
"port-version": 0
},
{
"git-tree": "c8997bd75a1e40cf8ac7f7d77a942afd84f01d2e",
"version-date": "2019-11-30",