[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     5d77485a6461bf03e2d6c5f340aa21cbe4f4cd67
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 09:35:50 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 09:38:36 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5d77485a

cmake-utils.eclass: Move CMAKE_USER_MAKE_RULES_OVERRIDE to gentoo config

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 4ac0951d46..73e7f0b73a 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -615,6 +615,7 @@ cmake-utils_src_configure() {
                SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output 
directory for libraries")
                SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE 
PATH "")
                SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH 
"")
+               SET (CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE 
FILEPATH "Gentoo override rules")
        _EOF_
        [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET 
(CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> 
"${common_config}"
 
@@ -673,7 +674,6 @@ cmake-utils_src_configure() {
                "${mycmakeargs_local[@]}"
                -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
                $([[ ${EAPI} == 5 ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)
-               -DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}"
                -DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
                "${MYCMAKEARGS}"
        )