| 1 |
commit: 614310843a123df7ed395f3ca897987b943c6c93 |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 1 20:37:40 2012 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 1 20:41:13 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=61431084 |
| 7 |
|
| 8 |
Set PREFIX properly, bug 358059 |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/cmake-utils.eclass | 11 ++++++----- |
| 12 |
1 files changed, 6 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 15 |
index 7fed054..b8f4862 100644 |
| 16 |
--- a/eclass/cmake-utils.eclass |
| 17 |
+++ b/eclass/cmake-utils.eclass |
| 18 |
@@ -146,6 +146,7 @@ _use_me_now_inverted() { |
| 19 |
# Eclass respects PREFIX variable, though it's not recommended way to set |
| 20 |
# install/lib/bin prefixes. |
| 21 |
# Use -DCMAKE_INSTALL_PREFIX=... CMake variable instead. |
| 22 |
+: ${PREFIX:=/usr} |
| 23 |
|
| 24 |
# @ECLASS-VARIABLE: CMAKE_BINARY |
| 25 |
# @DESCRIPTION: |
| 26 |
@@ -334,13 +335,13 @@ enable_cmake-utils_src_configure() { |
| 27 |
|
| 28 |
ELSE () |
| 29 |
|
| 30 |
- SET(CMAKE_PREFIX_PATH "${EPREFIX}${PREFIX:-/usr}" CACHE STRING ""FORCE) |
| 31 |
+ SET(CMAKE_PREFIX_PATH "${EPREFIX}${PREFIX}" CACHE STRING ""FORCE) |
| 32 |
SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE) |
| 33 |
SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) |
| 34 |
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "") |
| 35 |
- SET(CMAKE_INSTALL_RPATH "${EPREFIX}${PREFIX:-/usr}/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE) |
| 36 |
+ SET(CMAKE_INSTALL_RPATH "${EPREFIX}${PREFIX}/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE) |
| 37 |
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE) |
| 38 |
- SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}${PREFIX:-/usr}/lib" CACHE STRING "" FORCE) |
| 39 |
+ SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}${PREFIX}/lib" CACHE STRING "" FORCE) |
| 40 |
|
| 41 |
ENDIF (NOT APPLE) |
| 42 |
_EOF_ |
| 43 |
@@ -351,7 +352,7 @@ enable_cmake-utils_src_configure() { |
| 44 |
local libdir=$(get_libdir) |
| 45 |
cat > "${common_config}" <<- _EOF_ |
| 46 |
SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE) |
| 47 |
- SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries") |
| 48 |
+ SET (CMAKE_INSTALL_LIBDIR ${PREFIX}/${libdir} CACHE PATH "Output directory for libraries") |
| 49 |
_EOF_ |
| 50 |
[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" |
| 51 |
|
| 52 |
@@ -370,7 +371,7 @@ enable_cmake-utils_src_configure() { |
| 53 |
local cmakeargs=( |
| 54 |
--no-warn-unused-cli |
| 55 |
-C "${common_config}" |
| 56 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX:-/usr}" |
| 57 |
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}" |
| 58 |
"${mycmakeargs_local[@]}" |
| 59 |
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" |
| 60 |
-DCMAKE_INSTALL_DO_STRIP=OFF |
Archives