commit: 92c19cf807114f74174a9c28b083086aaebee0f0
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 00:29:11 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 00:18:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c19cf8
cmake-utils.eclass: use consistent style for SET
eclass/cmake-utils.eclass | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 7e4484c648a..bd04ed0f7f9 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -568,10 +568,10 @@ cmake-utils_src_configure() {
# When cross-compiling with a sysroot (e.g. with
crossdev's emerge wrappers)
# we need to tell cmake to use libs/headers from the
sysroot but programs from / only.
cat >> "${toolchain_file}" <<- _EOF_ || die
- set(CMAKE_FIND_ROOT_PATH "${SYSROOT}")
- set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
- set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
- set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+ SET (CMAKE_FIND_ROOT_PATH "${SYSROOT}")
+ SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+ SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+ SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
_EOF_
fi
fi
@@ -587,11 +587,11 @@ cmake-utils_src_configure() {
ELSE ()
- SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING ""
FORCE)
- SET(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
- SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
- SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL
"" FORCE)
+ SET (CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING ""
FORCE)
+ SET (CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
+ SET (CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
+ SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
+ SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL
"" FORCE)
ENDIF (NOT APPLE)
_EOF_
@@ -604,8 +604,8 @@ cmake-utils_src_configure() {
SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package
build")
SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path
suffix" FORCE)
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_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE
PATH "")
+ SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH
"")
_EOF_
[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET
(CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >>
"${common_config}"