diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-04-20 07:39:00 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-04-20 07:39:16 +1000 |
| commit | e34304a5e23ad47f71fbc0dd4ea4c0797104ef87 (patch) | |
| tree | 38539cf798508bb69eb9e9249ad5d1c09b2d5459 /dev-libs/grantlee/files | |
| parent | dev-ruby/rspec-mocks: Remove ruby19 (diff) | |
| download | gentoo-e34304a5e23ad47f71fbc0dd4ea4c0797104ef87.tar.gz gentoo-e34304a5e23ad47f71fbc0dd4ea4c0797104ef87.tar.bz2 gentoo-e34304a5e23ad47f71fbc0dd4ea4c0797104ef87.zip | |
dev-libs/grantlee: version bump
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-libs/grantlee/files')
| -rw-r--r-- | dev-libs/grantlee/files/grantlee-5.1.0-slot.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch new file mode 100644 index 000000000000..5b0d61d5c1eb --- /dev/null +++ b/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch @@ -0,0 +1,39 @@ +Install headers to a custom location to permit slotting with Qt4 version. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1324566..f98d5da 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -100,7 +100,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( BIN_INSTALL_DIR bin ) +-set( INCLUDE_INSTALL_DIR include ) ++set( INCLUDE_INSTALL_DIR include/grantlee5 ) + set( DATA_INSTALL_DIR share/apps ) + + # set up RPATH/install_name_dir +diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt +index dad2ef8..434d163 100644 +--- a/templates/lib/CMakeLists.txt ++++ b/templates/lib/CMakeLists.txt +@@ -107,6 +107,7 @@ if (Qt5Script_FOUND) + + 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_link_libraries(Grantlee_Templates + LINK_PRIVATE Qt5::Script + ) +diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt +index 557d262..d2dbaa1 100644 +--- a/textdocument/lib/CMakeLists.txt ++++ b/textdocument/lib/CMakeLists.txt +@@ -42,6 +42,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio") + ) + endforeach() + endif() ++target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") + + target_link_libraries(Grantlee_TextDocument + LINK_PUBLIC Qt5::Gui |