diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-06-17 22:39:01 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-06-17 22:39:01 +0000 |
| commit | 4192f788fb78634f6c84bd5b0361f40bcb3458b5 (patch) | |
| tree | 2ec397c414b34a8bb6b1dbf849f512f4e42b640d /eclass | |
| parent | Move gnome-base/gvfs dependency to PDEPEND to break circular dependency, bug ... (diff) | |
| download | gentoo-2-4192f788fb78634f6c84bd5b0361f40bcb3458b5.tar.gz gentoo-2-4192f788fb78634f6c84bd5b0361f40bcb3458b5.tar.bz2 gentoo-2-4192f788fb78634f6c84bd5b0361f40bcb3458b5.zip | |
Adjust cmake-utils to awoid not deleting some stuff after merge. We place all stuff to workdir and above. See bug #273949 for details.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index b83e0c81bc2e..e6990e1b24c8 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.28 2009/05/29 08:06:46 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.29 2009/06/17 22:39:01 scarabeus Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -130,8 +130,13 @@ _check_build_dir() { # # For installing binary doins "${CMAKE_BUILD_DIR}/${PN}" if [[ -n "${CMAKE_IN_SOURCE_BUILD}" ]]; then + # we build in source dir CMAKE_BUILD_DIR="${CMAKE_USE_DIR}" + elif [[ ${CMAKE_USE_DIR} = ${WORKDIR} ]]; then + # out of tree build, but with $S=$WORKDIR, see bug #273949 for reason. + CMAKE_BUILD_DIR="${CMAKE_USE_DIR}/build" else + # regular out of tree build [[ ${1} = init || -d ${CMAKE_USE_DIR}_build ]] && SUF="_build" || SUF="" CMAKE_BUILD_DIR="${CMAKE_USE_DIR}${SUF}" |