diff --git a/ports/simdjson/CONTROL b/ports/simdjson/CONTROL deleted file mode 100644 index 585ba0fa8..000000000 --- a/ports/simdjson/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: simdjson -Version: 2020-05-26 -Description: A extremely fast JSON library that can parse gigabytes of JSON per second -Homepage: https://github.com/lemire/simdjson -Supports: !x86 diff --git a/ports/simdjson/no_benchmark.patch b/ports/simdjson/no_benchmark.patch deleted file mode 100644 index 7ec15869e..000000000 --- a/ports/simdjson/no_benchmark.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 42640bc..7a621a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,6 @@ add_subdirectory(singleheader) - add_subdirectory(dependencies) - add_subdirectory(tests) - add_subdirectory(examples) --add_subdirectory(benchmark) - add_subdirectory(fuzz) - - # diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index be6f80a0a..409182a72 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,14 +1,9 @@ -# https://github.com/Microsoft/vcpkg/issues/5418#issuecomment-470519894 -vcpkg_fail_port_install(ON_ARCH "x86") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO lemire/simdjson - REF ac0c3093f4935fd266656abc9311a63fad98e99e - SHA512 69bc9ce45839d5e42aefcf5a96f82f3049b05591f4d463b788365123ba06c36f0f784ede02e5015bd96bf8d0e631ccaac285ed5a63048113f2ea01d91d51b395 + REPO simdjson/simdjson + REF 74870a81898ba44407f5dce1f0f50d4ea53fca04 # v0.4.6 HEAD_REF master - PATCHES - no_benchmark.patch # `_pclose` is not available on UWP + SHA512 abd8621cb5ed2a9ccad54c2b9e09a2fc8c8fe5d6a70501d23b879f33e34a6c25d33901b385615e9bb29817c302977aa89bc0ab2a13365e413da557f1a099dd21 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) @@ -20,6 +15,7 @@ vcpkg_configure_cmake( OPTIONS -DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC} -DSIMDJSON_IMPLEMENTATION_ARM64=${SIMDJSON_IMPLEMENTATION_ARM64} + -DSIMDJSON_JUST_LIBRARY=ON -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_SANITIZE=OFF # issue 10145, pr 11495 diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json new file mode 100644 index 000000000..618dcaf12 --- /dev/null +++ b/ports/simdjson/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "simdjson", + "version-string": "0.4.6", + "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/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 63bf03318..b5d8dbdce 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1606,8 +1606,6 @@ shogun:x64-windows-static = skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail -simdjson:arm-uwp=fail -simdjson:x86-windows=fail skia:arm64-windows=fail skia:arm-uwp=fail skia:x64-linux=fail