aboutsummaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-09-16 11:35:50 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-09-16 11:38:36 +0200
commit5d77485a6461bf03e2d6c5f340aa21cbe4f4cd67 (patch)
tree9c8b8b6e58fe3977896bd12a4ddcd531a9e60cfd /eclass
parentkde-plasma/kde-gtk-config: Tarball respun (diff)
downloadkde-5d77485a6461bf03e2d6c5f340aa21cbe4f4cd67.tar.gz
kde-5d77485a6461bf03e2d6c5f340aa21cbe4f4cd67.tar.bz2
kde-5d77485a6461bf03e2d6c5f340aa21cbe4f4cd67.zip
cmake-utils.eclass: Move CMAKE_USER_MAKE_RULES_OVERRIDE to gentoo config
Diffstat (limited to 'eclass')
-rw-r--r--eclass/cmake-utils.eclass2
1 files changed, 1 insertions, 1 deletions
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}"
)