diff options
| author | Dawid Wróbel <me@dawidwrobel.com> | 2021-09-20 19:55:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 10:55:40 -0700 |
| commit | 36fe65216518ac13d8cc06fafc6887599818156e (patch) | |
| tree | 91af927ca65f5ec20812f2019e9ca612207d4ece | |
| parent | 50f702b1fec1ffae1c0c1ca1935628334ceb0e47 (diff) | |
| download | vcpkg-36fe65216518ac13d8cc06fafc6887599818156e.tar.gz vcpkg-36fe65216518ac13d8cc06fafc6887599818156e.zip | |
[libsnoretoast] fix absolute include paths (#20229)
* [libsnoretoast] fix absolute include paths
* [libsnoretoast] fix versioning scheme
* [libsnoretoast] update versions
* Fix damage to previous version in the version database.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/libsnoretoast/include_fix.patch | 28 | ||||
| -rw-r--r-- | ports/libsnoretoast/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/libsnoretoast/vcpkg.json | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libsnoretoast.json | 5 |
5 files changed, 39 insertions, 3 deletions
diff --git a/ports/libsnoretoast/include_fix.patch b/ports/libsnoretoast/include_fix.patch new file mode 100644 index 000000000..e18860368 --- /dev/null +++ b/ports/libsnoretoast/include_fix.patch @@ -0,0 +1,28 @@ +From 7564823f8f0bc4d647bf3470ab7a2d8612418f32 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= <me@dawidwrobel.com> +Date: Fri, 17 Sep 2021 12:30:41 +0000 +Subject: [PATCH] Use relative INTERFACE_INCLUDE location + +Using ${CMAKE_INSTALL_PREFIX} hardcodes the installation location, +instead of having CMake +use ${_IMPORT_PREFIX} +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eef57f7..6c35b71 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,7 +1,7 @@ + add_library(SnoreToastActions INTERFACE) + target_include_directories(SnoreToastActions INTERFACE + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> +- $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/snoretoast> ++ $<INSTALL_INTERFACE:include/snoretoast> + ) + add_library(SnoreToast::SnoreToastActions ALIAS SnoreToastActions) + +-- +GitLab + diff --git a/ports/libsnoretoast/portfile.cmake b/ports/libsnoretoast/portfile.cmake index a9159e3c3..e97d5f637 100644 --- a/ports/libsnoretoast/portfile.cmake +++ b/ports/libsnoretoast/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF v0.8.0
SHA512 233751b6cc3f8099c742e4412a3c9ba8707a2f3c69b57bab93dd83b028aa0c0656cade8de1ece563843ace576fd0d8e5f3a29c254a07ed939d0a69cd2d4f6c2a
HEAD_REF master
+ PATCHES
+ include_fix.patch # https://invent.kde.org/libraries/snoretoast/-/merge_requests/1
)
vcpkg_cmake_configure(
@@ -16,7 +18,7 @@ vcpkg_cmake_configure( )
vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libsnoretoast")
+vcpkg_cmake_config_fixup(PACKAGE_NAME LibSnoreToast CONFIG_PATH "lib/cmake/libsnoretoast")
vcpkg_copy_tools(
TOOL_NAMES "snoretoast"
AUTO_CLEAN
diff --git a/ports/libsnoretoast/vcpkg.json b/ports/libsnoretoast/vcpkg.json index bfc244ad5..eb0c3838b 100644 --- a/ports/libsnoretoast/vcpkg.json +++ b/ports/libsnoretoast/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsnoretoast", - "version-semver": "0.8.0", + "version": "0.8.0", + "port-version": 1, "description": "A tool to create Windows Toast notifications and parse them on Windows 8 or later.", "homepage": "https://invent.kde.org/libraries/snoretoast", "supports": "windows & !uwp", diff --git a/versions/baseline.json b/versions/baseline.json index ac64e014d..45d2395fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3726,7 +3726,7 @@ }, "libsnoretoast": { "baseline": "0.8.0", - "port-version": 0 + "port-version": 1 }, "libsodium": { "baseline": "1.0.18", diff --git a/versions/l-/libsnoretoast.json b/versions/l-/libsnoretoast.json index 609c6e70e..513047f33 100644 --- a/versions/l-/libsnoretoast.json +++ b/versions/l-/libsnoretoast.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "66d0c5615dc55a5a5201e6de21d5a7acbaa4bd9b", + "version": "0.8.0", + "port-version": 1 + }, + { "git-tree": "7ddd1b84089de293b4a9d74af6b7593d089084a9", "version-semver": "0.8.0", "port-version": 0 |