diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-20 19:13:13 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-20 19:13:13 +0100 |
| commit | 45e4c41a046e4cb3bf61a3359b140555304da270 (patch) | |
| tree | fe161a3ee5ebc01c7de44daa37e2e9aff70fbb41 | |
| parent | 123fda70d951005511554d65d9d86151cd2f1c7f (diff) | |
| download | kde-45e4c41a046e4cb3bf61a3359b140555304da270.tar.gz kde-45e4c41a046e4cb3bf61a3359b140555304da270.tar.bz2 kde-45e4c41a046e4cb3bf61a3359b140555304da270.zip | |
Moar cleanup cmake-utils.
| -rw-r--r-- | eclass/cmake-utils.eclass | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 1fe9c5d5afa..c929a2f4c8a 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -45,11 +45,7 @@ _use_me_now() { # @VARIABLE: CMAKE_BUILD_DIR # @DESCRIPTION: # Determine using IN or OUT source build -if [[ -n "${CMAKE_IN_SOURCE_BUILD}" ]]; then - CMAKE_BUILD_DIR="${S}" -else - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_build" -fi +CMAKE_BUILD_DIR="" # defined in src_configure (not needed earlier). # @FUNCTION: cmake-utils_use_with # @USAGE: <USE flag> [flag name] @@ -94,6 +90,13 @@ cmake-utils_has() { _use_me_now HAVE "$@" ; } cmake-utils_src_configure() { debug-print-function $FUNCNAME $* + # in/out source build + if [[ -n "${CMAKE_IN_SOURCE_BUILD}" ]]; then + CMAKE_BUILD_DIR="${S}" + else + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_build" + fi + _common_configure_code local cmakeargs="${mycmakeargs} ${EXTRA_ECONF} -DCMAKE_INSTALL_DO_STRIP=OFF" mkdir -p "${CMAKE_BUILD_DIR}" |