From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OwGwd-0005Wp-Gv for garchives@archives.gentoo.org; Thu, 16 Sep 2010 16:04:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 211E0E06F7; Thu, 16 Sep 2010 16:04:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EFCEEE06F7 for ; Thu, 16 Sep 2010 16:04:13 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FD411B400C for ; Thu, 16 Sep 2010 16:04:13 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2263) id 777EC20051; Thu, 16 Sep 2010 16:04:11 +0000 (UTC) From: "Maciej Mrozowski (reavertm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, reavertm@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: cmake-utils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: cmake-utils.eclass X-VCS-Directories: eclass X-VCS-Committer: reavertm X-VCS-Committer-Name: Maciej Mrozowski Content-Type: text/plain; charset=utf8 Message-Id: <20100916160411.777EC20051@flycatcher.gentoo.org> Date: Thu, 16 Sep 2010 16:04:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3e4603d5-5866-4fd4-86e1-7c50315db808 X-Archives-Hash: fc383d64e7a3611a272f9782eaf06ed1 reavertm 10/09/16 16:04:11 Modified: cmake-utils.eclass Log: Allow setting CMAKE_BUILD_DIR (can be utilized in some exotic circumsta= nces) Revision Changes Path 1.59 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.59&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.59&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?r1=3D1.58&r2=3D1.59 Index: cmake-utils.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- cmake-utils.eclass 13 Aug 2010 05:02:49 -0000 1.58 +++ cmake-utils.eclass 16 Sep 2010 16:04:11 -0000 1.59 @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.58 2010= /08/13 05:02:49 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.59 2010= /09/16 16:04:11 reavertm Exp $ =20 # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -30,7 +30,7 @@ =20 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION # @DESCRIPTION: -# Specify the minimum allowable version of cmake. Defaults to 2.6.2-r1 +# Specify the minimum required CMake version. Default is 2.6.2-r1 CMAKE_MIN_VERSION=3D"${CMAKE_MIN_VERSION:-2.6.2-r1}" =20 CMAKEDEPEND=3D"" @@ -144,13 +144,8 @@ if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then # we build in source dir CMAKE_BUILD_DIR=3D"${CMAKE_USE_DIR}" - elif [[ ${CMAKE_USE_DIR} =3D ${WORKDIR} ]]; then - # out of tree build, but with $S=3D$WORKDIR, see bug #273949 for reaso= n. - CMAKE_BUILD_DIR=3D"${CMAKE_USE_DIR}/build" else - # regular out of tree build - [[ ${1} =3D init || -d ${CMAKE_USE_DIR}_build ]] && SUF=3D"_build" || = SUF=3D"" - CMAKE_BUILD_DIR=3D"${CMAKE_USE_DIR}${SUF}" + : ${CMAKE_BUILD_DIR:=3D${WORKDIR}/${P}_build} fi echo ">>> Working in BUILD_DIR: \"$CMAKE_BUILD_DIR\"" }