Skip to content

[libsnoretoast] fix absolute include paths #20229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 5 commits into from
Sep 20, 2021
Merged

[libsnoretoast] fix absolute include paths #20229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c71daa5
[libsnoretoast] fix absolute include paths
wrobelda Sep 17, 2021
8f765d9
[libsnoretoast] fix versioning scheme
wrobelda Sep 17, 2021
62a504c
[libsnoretoast] update versions
wrobelda Sep 17, 2021
8854c2c
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Sep 20, 2021
0ef2779
Fix damage to previous version in the version database.
BillyONeal Sep 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions ports/libsnoretoast/include_fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

4 changes: 3 additions & 1 deletion ports/libsnoretoast/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ports/libsnoretoast/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3722,7 +3722,7 @@
},
"libsnoretoast": {
"baseline": "0.8.0",
"port-version": 0
"port-version": 1
},
"libsodium": {
"baseline": "1.0.18",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libsnoretoast.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "66d0c5615dc55a5a5201e6de21d5a7acbaa4bd9b",
"version": "0.8.0",
"port-version": 1
},
{
"git-tree": "7ddd1b84089de293b4a9d74af6b7593d089084a9",
"version-semver": "0.8.0",
Expand Down