aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2021-05-27 05:53:59 +0800
committerGitHub <noreply@github.com>2021-05-26 14:53:59 -0700
commitb7147872b2fb1e1b2f5896ad95d68112808fc468 (patch)
tree6a80f0ecc573b1270bd1a028833757fd5eb18af4
parent2462a956c8068e4dab8aa8bbe9a406016106e188 (diff)
downloadvcpkg-b7147872b2fb1e1b2f5896ad95d68112808fc468.tar.gz
vcpkg-b7147872b2fb1e1b2f5896ad95d68112808fc468.zip
[simdjson] Fix dynamic usage (#16105)
* [simdjson] Update to 0.8.1 * Update versions * Update to 0.8.2 * Update versions * Format vcpkg.json * Update versions * Update versions/s-/simdjson.json
-rw-r--r--ports/simdjson/portfile.cmake9
-rw-r--r--ports/simdjson/vcpkg.json1
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/s-/simdjson.json5
4 files changed, 15 insertions, 2 deletions
diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake
index 7c8677759..e3e701690 100644
--- a/ports/simdjson/portfile.cmake
+++ b/ports/simdjson/portfile.cmake
@@ -26,6 +26,13 @@ vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/simdjson.h
+ "#if SIMDJSON_USING_LIBRARY"
+ "#if 1"
+ )
+endif()
+
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)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file
diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json
index 4a8e88783..0eb3ed90d 100644
--- a/ports/simdjson/vcpkg.json
+++ b/ports/simdjson/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "simdjson",
"version": "0.9.2",
+ "port-version": 1,
"description": "A extremely fast JSON library that can parse gigabytes of JSON per second",
"homepage": "https://simdjson.org/",
"license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index c3c0fe64f..62f1cd41c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5630,7 +5630,7 @@
},
"simdjson": {
"baseline": "0.9.2",
- "port-version": 0
+ "port-version": 1
},
"simple-fft": {
"baseline": "2020-06-14",
diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json
index a0f70563a..4de86b07f 100644
--- a/versions/s-/simdjson.json
+++ b/versions/s-/simdjson.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "c9528b67438ec071c4108f925f3976b937f91469",
+ "version": "0.9.2",
+ "port-version": 1
+ },
+ {
"git-tree": "821a523f19a2de0c686d119e17599f95fcd44ad1",
"version": "0.9.2",
"port-version": 0