cmake-utils.eclass: Move CMAKE_USER_MAKE_RULES_OVERRIDE to gentoo config
authorAndreas Sturmlechner <asturm@gentoo.org>
Sun, 16 Sep 2018 08:52:36 +0000 (10:52 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sun, 16 Sep 2018 11:22:58 +0000 (13:22 +0200)
Closes: https://bugs.gentoo.org/631522

eclass/cmake-utils.eclass

index d69c79f83b414f1c5aeb6328e93b424e9acf7f4b..98f5fa41b55ac27fcea54aa6ed3bc4e3cfe11349 100644 (file)
@@ -610,6 +610,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}"
 
@@ -668,7 +669,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}"
        )