Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH] cmake-utils.eclass: Override CMAKE_INSTALL_DOCDIR in EAPI 7
Date: Thu, 29 Mar 2018 19:14:26
Message-Id: 20180329191412.8793-1-mgorny@gentoo.org
1 Pass the correct docdir for GNUInstallDirs in EAPIs starting with 7.
2 We do not need add it retroactively to avoid breaking something
3 accidentally.
4 ---
5 eclass/cmake-utils.eclass | 6 ++++++
6 1 file changed, 6 insertions(+)
7
8 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
9 index 3302f27608b3..b21822fc03e9 100644
10 --- a/eclass/cmake-utils.eclass
11 +++ b/eclass/cmake-utils.eclass
12 @@ -614,6 +614,12 @@ cmake-utils_src_configure() {
13 _EOF_
14 [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
15
16 + if [[ ${EAPI} != [56] ]]; then
17 + cat >> "${common_config}" <<- _EOF_ || die
18 + SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
19 + _EOF_
20 + fi
21 +
22 # Wipe the default optimization flags out of CMake
23 if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
24 cat >> ${common_config} <<- _EOF_ || die
25 --
26 2.17.0.rc1

Replies