diff options
| author | Gleb Ignatev <44399142+GlebIgnatevEmlid@users.noreply.github.com> | 2021-10-12 06:29:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 20:29:57 -0700 |
| commit | aacceff7c553860a56a4d072c69bd9ca0dd92cc9 (patch) | |
| tree | 7bad8635bb3482659079c87c8f519c73ca029d2a | |
| parent | 9240fd0d8cc5ad7ed3663e58d99294a496f82854 (diff) | |
| download | vcpkg-aacceff7c553860a56a4d072c69bd9ca0dd92cc9.tar.gz vcpkg-aacceff7c553860a56a4d072c69bd9ca0dd92cc9.zip | |
[sentry-native] Add missing `CMakeFindDependencyMacro` for `find_dependency` (#20597)
* ports: sentry-native: Add CMakeFindDependencyMacro for find_dependency
find_dependency requires CMakeFindDependencyMacro to be included,
otherwise there is a CMake error when using find_package(sentry).
* versions: update sentry-native port-version to 2
| -rw-r--r-- | ports/sentry-native/fix-config-cmake.patch | 10 | ||||
| -rw-r--r-- | ports/sentry-native/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/s-/sentry-native.json | 5 |
4 files changed, 14 insertions, 5 deletions
diff --git a/ports/sentry-native/fix-config-cmake.patch b/ports/sentry-native/fix-config-cmake.patch index 3e7a33120..3d8db2a0e 100644 --- a/ports/sentry-native/fix-config-cmake.patch +++ b/ports/sentry-native/fix-config-cmake.patch @@ -1,9 +1,13 @@ diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in -index 89ea345..21d8732 100644 +index 89ea345..c14b31c 100644 --- a/sentry-config.cmake.in +++ b/sentry-config.cmake.in -@@ -5,7 +5,7 @@ set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@) +@@ -3,9 +3,11 @@ + set(SENTRY_BACKEND @SENTRY_BACKEND@) + set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@) ++include(CMakeFindDependencyMacro) ++ if(SENTRY_BACKEND STREQUAL "crashpad") if(@SENTRY_CRASHPAD_SYSTEM@) - find_package(crashpad REQUIRED) @@ -11,7 +15,7 @@ index 89ea345..21d8732 100644 else() include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake") endif() -@@ -14,7 +14,7 @@ endif() +@@ -14,7 +16,7 @@ endif() include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake") if(SENTRY_TRANSPORT STREQUAL "curl" AND NOT @BUILD_SHARED_LIBS@) diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 012a0d2e6..0cd2e1499 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sentry-native", "version-semver": "0.4.12", - "port-version": 1, + "port-version": 2, "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "supports": "!(arm | (arm64 & !osx) | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index f5a50b541..7d5da3bb3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6082,7 +6082,7 @@ }, "sentry-native": { "baseline": "0.4.12", - "port-version": 1 + "port-version": 2 }, "septag-sx": { "baseline": "2019-05-07", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index a8f936318..a68a56869 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "02751ec1af944b27f69c9b50a8df4017cc24add3", + "version-semver": "0.4.12", + "port-version": 2 + }, + { "git-tree": "6281c2a09a664a34db72684ff944c5920925e33e", "version-semver": "0.4.12", "port-version": 1 |