aboutsummaryrefslogtreecommitdiff
path: root/ports/cjson
diff options
context:
space:
mode:
authornicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>2021-07-20 12:24:58 -0500
committerGitHub <noreply@github.com>2021-07-20 10:24:58 -0700
commit0e1dc121856eef84bf1852134e548bf9898dabac (patch)
tree4bbae150d61121c81c33a2f4b7b92063e4db3060 /ports/cjson
parentb67fab9861239e33b722b9a44f5c96dec6ca807e (diff)
downloadvcpkg-0e1dc121856eef84bf1852134e548bf9898dabac.tar.gz
vcpkg-0e1dc121856eef84bf1852134e548bf9898dabac.zip
[rollup] Rollup PR 2021-07-16 (#19001)
* [rollup:2021-07-16 1/7] PR #18201 (@JackBoosY) [vcpkg-cmake] Add check for unused cmake variables * [rollup:2021-07-16 2/7] PR #18397 (@strega-nil) [vcpkg_list] add new function * [rollup:2021-07-16 3/7] PR #18782 (@strega-nil) [scripts-audit] vcpkg_build_ninja * [rollup:2021-07-16 4/7] PR #18784 (@strega-nil) [scripts-audit] vcpkg_minimum_required * [rollup:2021-07-16 5/7] PR #18785 (@strega-nil) [scripts-audit] vcpkg_replace_string * [rollup:2021-07-16 6/7] PR #18786 (@strega-nil) [scripts-audit] windows scripts * [rollup:2021-07-16 7/7] PR #18945 (@strega-nil) [many ports] remove deprecated vcpkg_check_features call [1/5] Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'ports/cjson')
-rw-r--r--ports/cjson/CONTROL7
-rw-r--r--ports/cjson/portfile.cmake3
-rw-r--r--ports/cjson/vcpkg.json12
3 files changed, 14 insertions, 8 deletions
diff --git a/ports/cjson/CONTROL b/ports/cjson/CONTROL
deleted file mode 100644
index 27474316a..000000000
--- a/ports/cjson/CONTROL
+++ /dev/null
@@ -1,7 +0,0 @@
-Source: cjson
-Version: 2019-11-30-1
-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/portfile.cmake b/ports/cjson/portfile.cmake
index 058c9009d..52e84654a 100644
--- a/ports/cjson/portfile.cmake
+++ b/ports/cjson/portfile.cmake
@@ -8,7 +8,8 @@ vcpkg_from_github(
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
- utils ENABLE_CJSON_UTILS
+ FEATURES
+ utils ENABLE_CJSON_UTILS
)
if(CMAKE_HOST_WIN32)
diff --git a/ports/cjson/vcpkg.json b/ports/cjson/vcpkg.json
new file mode 100644
index 000000000..92bec5fb2
--- /dev/null
+++ b/ports/cjson/vcpkg.json
@@ -0,0 +1,12 @@
+{
+ "name": "cjson",
+ "version-date": "2019-11-30",
+ "port-version": 2,
+ "description": "Ultralightweight JSON parser in ANSI C",
+ "homepage": "https://github.com/DaveGamble/cJSON",
+ "features": {
+ "utils": {
+ "description": "Enable building the cJSON_Utils library"
+ }
+ }
+}