Gentoo Archives: gentoo-commits

From: "Jonathan Callen (abcd)" <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: cmake-utils.eclass
Date: Fri, 30 Apr 2010 23:41:16
Message-Id: 20100430234111.4AB722C04C@corvid.gentoo.org
1 abcd 10/04/30 23:41:11
2
3 Modified: cmake-utils.eclass
4 Log:
5 Allow changing the minimum required cmake version
6
7 Revision Changes Path
8 1.50 eclass/cmake-utils.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/cmake-utils.eclass?rev=1.50&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/cmake-utils.eclass?rev=1.50&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/cmake-utils.eclass?r1=1.49&r2=1.50
13
14 Index: cmake-utils.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v
17 retrieving revision 1.49
18 retrieving revision 1.50
19 diff -u -r1.49 -r1.50
20 --- cmake-utils.eclass 10 Apr 2010 02:20:59 -0000 1.49
21 +++ cmake-utils.eclass 30 Apr 2010 23:41:11 -0000 1.50
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2010 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.49 2010/04/10 02:20:59 reavertm Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.50 2010/04/30 23:41:11 abcd Exp $
27
28 # @ECLASS: cmake-utils.eclass
29 # @MAINTAINER:
30 @@ -27,6 +27,12 @@
31 # Valid values are: always [default], optional (where the value is the useflag
32 # used for optionality)
33 WANT_CMAKE="${WANT_CMAKE:-always}"
34 +
35 +# @ECLASS-VARIABLE: CMAKE_MIN_VER
36 +# @DESCRIPTION:
37 +# Specify the minimum allowable version of cmake. Defaults to 2.6.2-r1
38 +CMAKE_MIN_VER="${CMAKE_MIN_VER:-2.6.2-r1}"
39 +
40 CMAKEDEPEND=""
41 case ${WANT_CMAKE} in
42 always)
43 @@ -49,7 +55,7 @@
44 : ${DESCRIPTION:="Based on the ${ECLASS} eclass"}
45
46 if [[ ${PN} != cmake ]]; then
47 - CMAKEDEPEND+=">=dev-util/cmake-2.6.2-r1"
48 + CMAKEDEPEND+=">=dev-util/cmake-${CMAKE_MIN_VER}"
49 fi
50
51 CMAKEDEPEND+=" userland_GNU? ( >=sys-apps/findutils-4.4.0 )"