kensington 14/10/15 13:44:24 Modified: ChangeLog cmake-utils.eclass Log: Introduce comment_add_subdirectory function. Make EAPI check more technically correct.
Revision Changes Path 1.1385 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1385&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1385&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1384&r2=1.1385 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1384 retrieving revision 1.1385 diff -u -r1.1384 -r1.1385 --- ChangeLog 15 Oct 2014 12:48:57 -0000 1.1384 +++ ChangeLog 15 Oct 2014 13:44:24 -0000 1.1385 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1384 2014/10/15 12:48:57 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1385 2014/10/15 13:44:24 kensington Exp $ + + 15 Oct 2014; Michael Palimaka <kensing...@gentoo.org> cmake-utils.eclass: + Introduce comment_add_subdirectory function. Make EAPI check more technically + correct. 15 Oct 2014; Michael Palimaka <kensing...@gentoo.org> +kde5-functions.eclass, +kde5.eclass: 1.111 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.111&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.111&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.110&r2=1.111 Index: cmake-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- cmake-utils.eclass 12 Aug 2014 14:58:40 -0000 1.110 +++ cmake-utils.eclass 15 Oct 2014 13:44:24 -0000 1.111 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.110 2014/08/12 14:58:40 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.111 2014/10/15 13:44:24 kensington Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -118,9 +118,9 @@ esac inherit toolchain-funcs multilib flag-o-matic eutils -case ${EAPI:-0} in +case ${EAPI} in 2|3|4|5) : ;; - *) die "EAPI=${EAPI} is not supported" ;; + *) die "EAPI=${EAPI:-0} is not supported" ;; esac CMAKE_EXPF="src_prepare src_configure src_compile src_test src_install" @@ -238,6 +238,21 @@ echo ${generator_name} } +# @FUNCTION: comment_add_subdirectory +# @USAGE: <subdirectory> +# @DESCRIPTION: +# Comment out an add_subdirectory call in CMakeLists.txt in the current directory +comment_add_subdirectory() { + if [[ -z ${1} ]]; then + die "comment_add_subdirectory must be passed the directory name to comment" + fi + + if [[ -e "CMakeLists.txt" ]]; then + sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${1//\//\\/}[[:space:]]*)/s/^/#DONOTCOMPILE /" \ + -i CMakeLists.txt || die "failed to comment add_subdirectory(${1})" + fi +} + # @FUNCTION: cmake-utils_use_with # @USAGE: <USE flag> [flag name] # @DESCRIPTION:
