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 1QiW2o-0005mM-4q for garchives@archives.gentoo.org; Sun, 17 Jul 2011 18:26:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E6E921C02D; Sun, 17 Jul 2011 18:26:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 12F5E21C02D for ; Sun, 17 Jul 2011 18:26:15 +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 979451B400A for ; Sun, 17 Jul 2011 18:26:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A51928003D for ; Sun, 17 Jul 2011 18:26:13 +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: c459b2654a9108bd6e2293e164792d205e0a6cf3 Date: Sun, 17 Jul 2011 18:26:13 +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: 44938993e739b24896f0150f7a0521e7 commit: c459b2654a9108bd6e2293e164792d205e0a6cf3 Author: Andreas K. Huettel (dilfridge) gentoo o= rg> AuthorDate: Sun Jul 17 18:25:31 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sun Jul 17 18:25:31 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dc459b265 Actually make it possible to disable the module removal --- eclass/cmake-utils.eclass | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 4515db1..c33bc33 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -39,6 +39,11 @@ CMAKE_MIN_VERSION=3D"${CMAKE_MIN_VERSION:-2.8.1}" # in order to force packages to use the system version. CMAKE_REMOVE_MODULES=3D"${CMAKE_REMOVE_MODULES:-FindBLAS FindLAPACK}" =20 +# @ECLASS-VARIABLE: CMAKE_REMOVE +# @DESCRIPTION: +# Do we want to remove anything? YES or whatever else +CMAKE_REMOVE=3D"${CMAKE_REMOVE:-YES}" + CMAKEDEPEND=3D"" case ${WANT_CMAKE} in always) @@ -277,10 +282,12 @@ _modify-cmakelists() { enable_cmake-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" =20 - local name - for name in ${CMAKE_REMOVE_MODULES} ; do - find "${S}" -name ${name}.cmake -exec rm -v {} + - done + [[ "${CMAKE_REMOVE}" =3D=3D "YES" ]] && { + local name + for name in ${CMAKE_REMOVE_MODULES} ; do + find "${S}" -name ${name}.cmake -exec rm -v {} + + done + } =20 _check_build_dir =20