diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-09-16 10:52:36 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-09-16 13:22:58 +0200 |
| commit | f198fdc373429429e347c7c8b6273254a66d4076 (patch) | |
| tree | 09a8c8729241bc1390d87226c0e8aaa4e9cc1997 /eclass/cmake-utils.eclass | |
| parent | app-crypt/tpm-emulator: fix strncpy build (diff) | |
| download | gentoo-f198fdc373429429e347c7c8b6273254a66d4076.tar.gz gentoo-f198fdc373429429e347c7c8b6273254a66d4076.tar.bz2 gentoo-f198fdc373429429e347c7c8b6273254a66d4076.zip | |
cmake-utils.eclass: Move CMAKE_USER_MAKE_RULES_OVERRIDE to gentoo config
Closes: https://bugs.gentoo.org/631522
Diffstat (limited to 'eclass/cmake-utils.eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index d69c79f83b41..98f5fa41b55a 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -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}" ) |