| 1 |
commit: 11ddbefe34d0cdbda28e58c67eec255eb20b8094 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 29 19:05:54 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 2 15:24:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=11ddbefe |
| 7 |
|
| 8 |
cmake-utils.eclass: Override CMAKE_INSTALL_DOCDIR in EAPI 7 |
| 9 |
|
| 10 |
Pass the correct docdir for GNUInstallDirs in EAPIs starting with 7. |
| 11 |
We do not need add it retroactively to avoid breaking something |
| 12 |
accidentally. |
| 13 |
|
| 14 |
eclass/cmake-utils.eclass | 6 ++++++ |
| 15 |
1 file changed, 6 insertions(+) |
| 16 |
|
| 17 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 18 |
index 4dc7c4456f..6541f2af0f 100644 |
| 19 |
--- a/eclass/cmake-utils.eclass |
| 20 |
+++ b/eclass/cmake-utils.eclass |
| 21 |
@@ -614,6 +614,12 @@ cmake-utils_src_configure() { |
| 22 |
_EOF_ |
| 23 |
[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" |
| 24 |
|
| 25 |
+ if [[ ${EAPI} != [56] ]]; then |
| 26 |
+ cat >> "${common_config}" <<- _EOF_ || die |
| 27 |
+ SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") |
| 28 |
+ _EOF_ |
| 29 |
+ fi |
| 30 |
+ |
| 31 |
# Wipe the default optimization flags out of CMake |
| 32 |
if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then |
| 33 |
cat >> ${common_config} <<- _EOF_ || die |
Archives