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 1QiXRZ-0006x5-Jt for garchives@archives.gentoo.org; Sun, 17 Jul 2011 19:56:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92CEF21C1F3; Sun, 17 Jul 2011 19:55:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 681C021C1F3 for ; Sun, 17 Jul 2011 19:55:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D75D41B400D for ; Sun, 17 Jul 2011 19:55:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 109D08003D for ; Sun, 17 Jul 2011 19:55:28 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/cmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: d5186a4b3323678b0738b3760f6ba0318eec2930 Date: Sun, 17 Jul 2011 19:55:28 +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: X-Archives-Hash: 0d5859967564e0859b59170129000697 commit: d5186a4b3323678b0738b3760f6ba0318eec2930 Author: Andreas K. Huettel (dilfridge) gentoo o= rg> AuthorDate: Sun Jul 17 19:46:20 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sun Jul 17 19:46:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dd5186a4b Improve variable names --- eclass/cmake-utils.eclass | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index c33bc33..f142fdd 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -33,16 +33,16 @@ WANT_CMAKE=3D"${WANT_CMAKE:-always}" # Specify the minimum required CMake version. Default is 2.8.1 CMAKE_MIN_VERSION=3D"${CMAKE_MIN_VERSION:-2.8.1}" =20 -# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES +# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST # @DESCRIPTION: # Space-separated list of CMake modules that will be removed in $S durin= g src_prepare,=20 # in order to force packages to use the system version. -CMAKE_REMOVE_MODULES=3D"${CMAKE_REMOVE_MODULES:-FindBLAS FindLAPACK}" +CMAKE_REMOVE_MODULES_LIST=3D"${CMAKE_REMOVE_MODULES_LIST:-FindBLAS FindL= APACK}" =20 -# @ECLASS-VARIABLE: CMAKE_REMOVE +# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES # @DESCRIPTION: -# Do we want to remove anything? YES or whatever else -CMAKE_REMOVE=3D"${CMAKE_REMOVE:-YES}" +# Do we want to remove anything? yes or whatever else for no +CMAKE_REMOVE_MODULES=3D"${CMAKE_REMOVE_MODULES:-yes}" =20 CMAKEDEPEND=3D"" case ${WANT_CMAKE} in @@ -282,9 +282,9 @@ _modify-cmakelists() { enable_cmake-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" =20 - [[ "${CMAKE_REMOVE}" =3D=3D "YES" ]] && { + [[ "${CMAKE_REMOVE_MODULES}" =3D=3D "yes" ]] && { local name - for name in ${CMAKE_REMOVE_MODULES} ; do + for name in ${CMAKE_REMOVE_MODULES_LIST} ; do find "${S}" -name ${name}.cmake -exec rm -v {} + done }