Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Wed, 05 Feb 2014 14:52:00
Message-Id: 1391611890.0d6fbc1cd0401aa17184fa3898e8d68ba99959d5.kensington@gentoo
1 commit: 0d6fbc1cd0401aa17184fa3898e8d68ba99959d5
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 5 14:51:30 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 5 14:51:30 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0d6fbc1c
7
8 [eclass] Use simpler default variable definitions.
9
10 ---
11 eclass/cmake-utils.eclass | 11 ++++++-----
12 1 file changed, 6 insertions(+), 5 deletions(-)
13
14 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
15 index 802c58a..16dcd33 100644
16 --- a/eclass/cmake-utils.eclass
17 +++ b/eclass/cmake-utils.eclass
18 @@ -26,36 +26,37 @@ ___ECLASS_ONCE_CMAKE_UTILS="recur -_+^+_- spank"
19 # This is usefull when only part of aplication is using cmake build system.
20 # Valid values are: always [default], optional (where the value is the useflag
21 # used for optionality)
22 -WANT_CMAKE="${WANT_CMAKE:-always}"
23 +: ${WANT_CMAKE:=always}
24
25 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION
26 # @DESCRIPTION:
27 # Specify the minimum required CMake version.
28 -CMAKE_MIN_VERSION="${CMAKE_MIN_VERSION:-2.8.9}"
29 +: ${CMAKE_MIN_VERSION:=2.8.9}
30
31 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST
32 # @DESCRIPTION:
33 # Space-separated list of CMake modules that will be removed in $S during src_prepare,
34 # in order to force packages to use the system version.
35 -CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST:-FindBLAS FindLAPACK}"
36 +: ${CMAKE_REMOVE_MODULES_LIST:=FindBLAS FindLAPACK}
37
38 # @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES
39 # @DESCRIPTION:
40 # Do we want to remove anything? yes or whatever else for no
41 +: ${CMAKE_REMOVE_MODULES:=yes}
42 CMAKE_REMOVE_MODULES="${CMAKE_REMOVE_MODULES:-yes}"
43
44 # @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
45 # @DESCRIPTION:
46 # Specify a makefile generator to be used by cmake.
47 # At this point only "emake" and "ninja" are supported.
48 -CMAKE_MAKEFILE_GENERATOR="${CMAKE_MAKEFILE_GENERATOR:-emake}"
49 +: ${CMAKE_MAKEFILE_GENERATOR:=emake}
50
51 # @ECLASS-VARIABLE: CMAKE_WARN_UNUSED_CLI
52 # @DESCRIPTION:
53 # Warn about variables that are declared on the command line
54 # but not used. Might give false-positives.
55 # "no" to disable (default) or anything else to enable.
56 -CMAKE_WARN_UNUSED_CLI="${CMAKE_WARN_UNUSED_CLI:-no}"
57 +: ${CMAKE_WARN_UNUSED_CLI:=no}
58
59 CMAKEDEPEND=""
60 case ${WANT_CMAKE} in