aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormyd7349 <myd7349@gmail.com>2021-04-30 01:44:52 +0800
committerGitHub <noreply@github.com>2021-04-29 10:44:52 -0700
commit2a61223ac027bb0e35495b3a1e8e201f8504797b (patch)
treea2b84433dc56238f6389281cf8364165ba810d28
parente93ea4e1664b988df4d9113e61ca7af765ac5255 (diff)
downloadvcpkg-2a61223ac027bb0e35495b3a1e8e201f8504797b.tar.gz
vcpkg-2a61223ac027bb0e35495b3a1e8e201f8504797b.zip
[simdjson] Update to 0.9.2 (#17200)
* [simdjson] Update to 0.9.2 * [simdjson] Bump version * [simdjson] Modernize * [simdjson] Overwrite version * [simdjson] Modernize * [simdjson] Overwrite version * [simdjson] I don't intend to change this line
-rw-r--r--ports/simdjson/portfile.cmake13
-rw-r--r--ports/simdjson/vcpkg.json14
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/s-/simdjson.json5
4 files changed, 24 insertions, 10 deletions
diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake
index 30de7ceee..7c8677759 100644
--- a/ports/simdjson/portfile.cmake
+++ b/ports/simdjson/portfile.cmake
@@ -1,17 +1,16 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO simdjson/simdjson
- REF 61c8cfa07deb7625bb0e6b80dbceb42edd4bf387 # v0.8.2
+ REF c6c29c28278aeb29998e89f008908d951bb40c39 # v0.9.2
HEAD_REF master
- SHA512 bf9c3014fd6b0d31c3d01236b2e49818fae3413441912b64dd9ed5e6c284c915a9d797a7deeb647f80109f5b1ff77d2d35934db5de54480e7cba0ca73ea54cd8
+ SHA512 2c033e8fa253103f00606b7a14502d19c06385f22d1d09ea4b1edc6f443ba51ee95d49c790a05a64e28cd03f4350118b23c3c7f759a60e26a43da658609a5317
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_TARGET_ARCHITECTURE}" "arm64" SIMDJSON_IMPLEMENTATION_ARM64)
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
OPTIONS
-DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC}
-DSIMDJSON_IMPLEMENTATION_ARM64=${SIMDJSON_IMPLEMENTATION_ARM64}
@@ -21,12 +20,12 @@ vcpkg_configure_cmake(
-DSIMDJSON_SANITIZE=OFF # issue 10145, pr 11495
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json
index 47909373f..4a8e88783 100644
--- a/ports/simdjson/vcpkg.json
+++ b/ports/simdjson/vcpkg.json
@@ -1,7 +1,17 @@
{
"name": "simdjson",
- "version-string": "0.8.2",
+ "version": "0.9.2",
"description": "A extremely fast JSON library that can parse gigabytes of JSON per second",
"homepage": "https://simdjson.org/",
- "license": "Apache-2.0"
+ "license": "Apache-2.0",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
+ ]
}
diff --git a/versions/baseline.json b/versions/baseline.json
index c7b1364b4..67d5f314a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5593,7 +5593,7 @@
"port-version": 0
},
"simdjson": {
- "baseline": "0.8.2",
+ "baseline": "0.9.2",
"port-version": 0
},
"simple-fft": {
diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json
index 6a350baa8..a0f70563a 100644
--- a/versions/s-/simdjson.json
+++ b/versions/s-/simdjson.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "821a523f19a2de0c686d119e17599f95fcd44ad1",
+ "version": "0.9.2",
+ "port-version": 0
+ },
+ {
"git-tree": "3b3e5c3120162cd5d7536bcb24d9b85e3a67cf99",
"version-string": "0.8.2",
"port-version": 0