From bde7e87f48cff3ad6ab6e1ae20283a005efe6715 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Sat, 4 Sep 2021 02:37:59 +0200 Subject: [sentry-native] Update port to use new vcpkg cmake scripts (#19839) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 7 +++---- ports/sentry-native/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index e538c1222..64165b1c5 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -30,9 +30,8 @@ if (NOT DEFINED SENTRY_BACKEND) endif() endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DSENTRY_BUILD_TESTS=OFF -DSENTRY_BUILD_EXAMPLES=OFF @@ -40,13 +39,13 @@ vcpkg_configure_cmake( -DCRASHPAD_ZLIB_SYSTEM=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sentry TARGET_PATH share/sentry) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sentry) if (SENTRY_BACKEND STREQUAL "crashpad") vcpkg_copy_tools( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 84840940e..012a0d2e6 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sentry-native", "version-semver": "0.4.12", + "port-version": 1, "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "supports": "!(arm | (arm64 & !osx) | uwp)", @@ -9,6 +10,14 @@ "name": "curl", "platform": "!windows" }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index b70033812..6512e015b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5858,7 +5858,7 @@ }, "sentry-native": { "baseline": "0.4.12", - "port-version": 0 + "port-version": 1 }, "septag-sx": { "baseline": "2019-05-07-2", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 8db9ae550..a8f936318 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6281c2a09a664a34db72684ff944c5920925e33e", + "version-semver": "0.4.12", + "port-version": 1 + }, { "git-tree": "85e3e8c19428a75c746ff7389f86746f1a7ef93f", "version-semver": "0.4.12", -- cgit v1.2.3