diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-12-04 00:26:04 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-12-04 00:26:04 +0100 |
| commit | 7051d6521ca70f23ea04df3bc29d7bb5dc63beed (patch) | |
| tree | fccc63870c28baa0725c29a0fde2da1eed34f11a | |
| parent | ca30da81a08f2bea27240a95402d27692776deca (diff) | |
| download | kde-7051d6521ca70f23ea04df3bc29d7bb5dc63beed.tar.gz kde-7051d6521ca70f23ea04df3bc29d7bb5dc63beed.tar.bz2 kde-7051d6521ca70f23ea04df3bc29d7bb5dc63beed.zip | |
dev-libs/grantlee: Fix slot patch
Thanks-to: jospezial <jospezial@gmx.de>
Closes: https://bugs.gentoo.org/701534
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | dev-libs/grantlee/files/grantlee-9999-slot.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dev-libs/grantlee/files/grantlee-9999-slot.patch b/dev-libs/grantlee/files/grantlee-9999-slot.patch index 546d623ef79..9490df2327e 100644 --- a/dev-libs/grantlee/files/grantlee-9999-slot.patch +++ b/dev-libs/grantlee/files/grantlee-9999-slot.patch @@ -5,6 +5,9 @@ Subject: [PATCH] Install headers to a custom location to permit slotting That was previously necessary with Qt4 version, let's keep it while Qt6 is around the corner. + +Amended with target_include_directories fix by jospezial. + --- templates/lib/CMakeLists.txt | 5 +++-- textdocument/lib/CMakeLists.txt | 5 +++-- @@ -18,7 +21,7 @@ index 5058481..3ef29a4 100644 target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS}) target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) -+ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") ++ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>") target_link_libraries(Grantlee_Templates PRIVATE Qt5::Qml ) @@ -43,7 +46,7 @@ index 2c5a96f..c42d32a 100644 ) endforeach() endif() -+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") ++target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>") target_link_libraries(Grantlee_TextDocument PUBLIC Qt5::Gui @@ -62,4 +65,3 @@ index 2c5a96f..c42d32a 100644 ) -- 2.24.0 - |