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

["Maciej Mrozowski (reavertm)" <reavertm@gentoo.org>]

reavertm    10/04/10 02:20:59

  Modified:             cmake-utils.eclass
  Log:
  Display compiler and linker flags - a lousy compromise between excessive verbosity and hiding relevant information

Revision  Changes    Path
1.49                 eclass/cmake-utils.eclass

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

Index: cmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cmake-utils.eclass	24 Mar 2010 21:09:28 -0000	1.48
+++ cmake-utils.eclass	10 Apr 2010 02:20:59 -0000	1.49
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.48 2010/03/24 21:09:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.49 2010/04/10 02:20:59 reavertm Exp $
 
 # @ECLASS: cmake-utils.eclass
 # @MAINTAINER:
@@ -29,12 +29,12 @@
 WANT_CMAKE="${WANT_CMAKE:-always}"
 CMAKEDEPEND=""
 case ${WANT_CMAKE} in
-		always)
-			;;
-		*)
-			IUSE+=" ${WANT_CMAKE}"
-			CMAKEDEPEND+="${WANT_CMAKE}? ( "
-			;;
+	always)
+		;;
+	*)
+		IUSE+=" ${WANT_CMAKE}"
+		CMAKEDEPEND+="${WANT_CMAKE}? ( "
+		;;
 esac
 inherit toolchain-funcs multilib flag-o-matic base
 
@@ -154,7 +154,6 @@
 		# regular out of tree build
 		[[ ${1} = init || -d ${CMAKE_USE_DIR}_build ]] && SUF="_build" || SUF=""
 		CMAKE_BUILD_DIR="${CMAKE_USE_DIR}${SUF}"
-
 	fi
 	echo ">>> Working in BUILD_DIR: \"$CMAKE_BUILD_DIR\""
 }
@@ -246,8 +245,15 @@
 	cat >> CMakeLists.txt <<- _EOF_
 
 		MESSAGE(STATUS "<<< Gentoo configuration >>>
-		Build type: \${CMAKE_BUILD_TYPE}
-		Install path: \${CMAKE_INSTALL_PREFIX}\n")
+		Build type      \${CMAKE_BUILD_TYPE}
+		Install path    \${CMAKE_INSTALL_PREFIX}
+		Compiler flags:
+		C               \${CMAKE_C_FLAGS}
+		C++             \${CMAKE_CXX_FLAGS}
+		Linker flags:
+		Executable      \${CMAKE_EXE_LINKER_FLAGS}
+		Module          \${CMAKE_MODULE_LINKER_FLAGS}
+		Shared          \${CMAKE_SHARED_LINKER_FLAGS}\n")
 	_EOF_
 }
 
@@ -262,9 +268,9 @@
 
 	# check if CMakeLists.txt exist and if no then die
 	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
-		eerror "I was unable to locate CMakeLists.txt under:"
+		eerror "Unable to locate CMakeLists.txt under:"
 		eerror "\"${CMAKE_USE_DIR}/CMakeLists.txt\""
-		eerror "You should consider not inheriting the cmake eclass."
+		eerror "Consider not inheriting the cmake eclass."
 		die "FATAL: Unable to find CMakeLists.txt"
 	fi