diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index e3e701690e3db5..ffc1ba2fd528a2 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,23 +1,33 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF c6c29c28278aeb29998e89f008908d951bb40c39 # v0.9.2 + REF e9b893ff1b13c6a70135827c62b3f3d65938d135 # v0.9.6 HEAD_REF master - SHA512 2c033e8fa253103f00606b7a14502d19c06385f22d1d09ea4b1edc6f443ba51ee95d49c790a05a64e28cd03f4350118b23c3c7f759a60e26a43da658609a5317 + SHA512 977b92ffae7219680f3d8567b1911b0d17ac1143a2ba58d7a4007cdcbf42dca6362853fcf3c3caf4af2029bc5f6a3cb8fab6139050a9d8539e8e4c7df646837d +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + exceptions SIMDJSON_EXCEPTIONS + threads SIMDJSON_ENABLE_THREADS + INVERTED_FEATURES + deprecated SIMDJSON_DISABLE_DEPRECATED_API ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_TARGET_ARCHITECTURE}" "arm64" SIMDJSON_IMPLEMENTATION_ARM64) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} 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 + -DSIMDJSON_SANITIZE_UNDEFINED=OFF + -DSIMDJSON_SANITIZE=OFF + -DSIMDJSON_SANITIZE_THREADS=OFF + -DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC} + -DSIMDJSON_DEVELOPMENT_CHECKS=OFF + -DSIMDJSON_VERBOSE_LOGGING=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -26,13 +36,6 @@ 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) \ No newline at end of file +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 0eb3ed90d7c1d1..13f89c1a7c590e 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,7 +1,6 @@ { "name": "simdjson", - "version": "0.9.2", - "port-version": 1, + "version": "0.9.6", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", @@ -14,5 +13,21 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "deprecated", + "exceptions", + "threads" + ], + "features": { + "deprecated": { + "description": "Enable deprecated APIs" + }, + "exceptions": { + "description": "Enable exception-throwing interface" + }, + "threads": { + "description": "Link with thread support" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 88a4bcd85a9ef8..02377a5cfdfe6f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5805,8 +5805,8 @@ "port-version": 0 }, "simdjson": { - "baseline": "0.9.2", - "port-version": 1 + "baseline": "0.9.6", + "port-version": 0 }, "simple-fft": { "baseline": "2020-06-14", diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index 4de86b07f85344..8570d578b415bf 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b913c5ecbf889a46c809032952c348605a78a391", + "version": "0.9.6", + "port-version": 0 + }, { "git-tree": "c9528b67438ec071c4108f925f3976b937f91469", "version": "0.9.2",