diff options
author | Robby Workman <rworkman@slackbuilds.org> | 2021-04-19 23:56:37 -0500 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-19 23:56:37 -0500 |
commit | 70f2cd901e32d2ef610e3c3132d7646c26dade98 (patch) | |
tree | da9244d7a177e8101ec0c84f58db0c435afbfcba /libraries/grantlee-qt5/grantlee-5.2.0-install_headers_into_versioned_directory.patch | |
parent | 4a792b2a2acfc4a78009a10dca6ce1a0c6c369b5 (diff) | |
download | slackbuilds-70f2cd901e32d2ef610e3c3132d7646c26dade98.tar.gz slackbuilds-70f2cd901e32d2ef610e3c3132d7646c26dade98.tar.xz |
libraries/grantlee-qt5: Removed (added to Slackware)
Diffstat (limited to 'libraries/grantlee-qt5/grantlee-5.2.0-install_headers_into_versioned_directory.patch')
-rw-r--r-- | libraries/grantlee-qt5/grantlee-5.2.0-install_headers_into_versioned_directory.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/libraries/grantlee-qt5/grantlee-5.2.0-install_headers_into_versioned_directory.patch b/libraries/grantlee-qt5/grantlee-5.2.0-install_headers_into_versioned_directory.patch deleted file mode 100644 index ccc4577a31..0000000000 --- a/libraries/grantlee-qt5/grantlee-5.2.0-install_headers_into_versioned_directory.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 9dfa187569e4c9c4e72ace60c051cbfa79434d77 Mon Sep 17 00:00:00 2001 -From: Troy Dawson <tdawson@redhat.com> -Date: Fri, 14 Feb 2020 13:43:27 -0800 -Subject: [PATCH] install headers into versioned directory - ---- - CMakeLists.txt | 1 + - templates/lib/CMakeLists.txt | 6 ++++-- - textdocument/lib/CMakeLists.txt | 8 ++++++-- - 3 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 20edcdc..8df3dd6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,6 +80,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6 - - set( LIB_INSTALL_DIR lib${LIB_SUFFIX} ) - set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} ) -+set( INCLUDE_INSTALL_DIR include/Grantlee5 ) - - # set up RPATH/install_name_dir - set( CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) -diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt -index 5058481..c4262f3 100644 ---- a/templates/lib/CMakeLists.txt -+++ b/templates/lib/CMakeLists.txt -@@ -106,6 +106,8 @@ if (Qt5Qml_FOUND) - ) - endif() - -+target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") -+ - if (BUILD_TESTS) - set(GRANTLEE_TESTS_EXPORT "GRANTLEE_TEMPLATES_EXPORT") - endif() -@@ -152,10 +154,10 @@ install(FILES - token.h - util.h - variable.h -- DESTINATION include/grantlee COMPONENT Templates -+ DESTINATION ${INCLUDE_INSTALL_DIR}/grantlee COMPONENT Templates - ) - - install(FILES - grantlee_templates.h -- DESTINATION include COMPONENT Templates -+ DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Templates - ) -diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt -index 2c5a96f..bf56052 100644 ---- a/textdocument/lib/CMakeLists.txt -+++ b/textdocument/lib/CMakeLists.txt -@@ -35,6 +35,10 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio") - endforeach() - endif() - -+target_include_directories(Grantlee_TextDocument -+ INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>" -+) -+ - target_link_libraries(Grantlee_TextDocument - PUBLIC Qt5::Gui - ) -@@ -59,10 +63,10 @@ install(FILES - texthtmlbuilder.h - mediawikimarkupbuilder.h - ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h -- DESTINATION include/grantlee COMPONENT TextDocument -+ DESTINATION ${INCLUDE_INSTALL_DIR}/grantlee COMPONENT TextDocument - ) - - install(FILES - grantlee_textdocument.h -- DESTINATION include COMPONENT TextDocument -+ DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT TextDocument - ) --- -2.24.1 |