[gentoo-commits] gentoo-x86 commit in eclass: cmake-utils.eclass

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    08/09/28 16:19:06

  Modified:             cmake-utils.eclass
  Log:
  Applied fixes to the cmake-utils eclass to support EAPI-2. Thanks to Tomas Chvatal (scarabeus) for the patch.

Revision  Changes    Path
1.9                  eclass/cmake-utils.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/cmake-utils.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/cmake-utils.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/cmake-utils.eclass?r1=1.8&r2=1.9

Index: cmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cmake-utils.eclass	23 Apr 2008 11:55:51 -0000	1.8
+++ cmake-utils.eclass	28 Sep 2008 16:19:06 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.8 2008/04/23 11:55:51 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.9 2008/09/28 16:19:06 jmbsvicetto Exp $
 
 # @ECLASS: cmake-utils.eclass
 # @MAINTAINER:
@@ -21,7 +21,7 @@
 
 DEPEND=">=dev-util/cmake-2.4.6"
 
-EXPORT_FUNCTIONS src_compile src_test src_install
+EXPORT_FUNCTIONS src_configure src_compile src_test src_install
 
 # Internal function use by cmake-utils_use_with and cmake-utils_use_enable
 _use_me_now() {
@@ -70,11 +70,11 @@
 # and -DHAVE_FOO=OFF if it is disabled.
 cmake-utils_has() { _use_me_now HAVE "$@" ; }
 
-# @FUNCTION: cmake-utils_src_compile
+# @FUNCTION: cmake-utils_src_configure
 # @DESCRIPTION:
-# General function for compiling with cmake. Default behaviour is to start an
-# out-of-source build. All arguments are passed to cmake-utils_src_make.
-cmake-utils_src_compile() {
+# General function for configuring with cmake. Default behaviour is to start an
+# out-of-source build.
+cmake-utils_src_configure() {
 	debug-print-function $FUNCNAME $*
 
 	if [[ -n "${CMAKE_IN_SOURCE_BUILD}" ]]; then
@@ -82,6 +82,21 @@
 	else
 		cmake-utils_src_configureout
 	fi
+}
+
+# @FUNCTION: cmake-utils_src_compile
+# @DESCRIPTION:
+# General function for compiling with cmake. Default behaviour is to check for
+# eapi and based on it configure or only compile
+cmake-utils_src_compile() {
+	case ${EAPI} in
+		2 | 2_pre3 | 2_pre2 | 2_pre1)
+		;;
+	*)
+		cmake-utils_src_configure
+		;;
+	esac
+
 	cmake-utils_src_make "$@"
 }