[gentoo-dev] [PATCH] cmake.eclass: cmake_comment_add_subdirectory: optionally accept "-f "

[Andreas Sturmlechner]

New function description:

        Comment out one or more add_subdirectory calls with #DONOTBUILD in
        a) a given file path (error out on nonexisting path)
        b) a CMakeLists.txt file inside a given directory (ewarn if not found)
        c) CMakeLists.txt in current directory (do nothing if not found).

c) is unchanged prior behaviour.

Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org>
---
 eclass/cmake.eclass | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index b853727b47..98f10f8d9a 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -207,21 +207,44 @@ cmake_run_in() {
 }
 
 # @FUNCTION: cmake_comment_add_subdirectory
-# @USAGE: <subdirectory>
+# @USAGE: [-f <filename or directory>] <subdirectory> [<subdirectories>]
 # @DESCRIPTION:
-# Comment out one or more add_subdirectory calls in CMakeLists.txt in the 
current directory
+# Comment out one or more add_subdirectory calls with #DONOTBUILD in
+# a) a given file path (error out on nonexisting path)
+# b) a CMakeLists.txt file inside a given directory (ewarn if not found)
+# c) CMakeLists.txt in current directory (do nothing if not found).
 cmake_comment_add_subdirectory() {
-       if [[ -z ${1} ]]; then
-               die "${FUNCNAME[0]} must be passed at least one directory name 
to comment"
+       local d filename="CMakeLists.txt"
+       if [[ $# -lt 1 ]]; then
+               die "${FUNCNAME} must be passed at least one subdirectory name 
to comment"
        fi
+       case ${1} in
+               -f)
+                       if [[ $# -ge 2 ]]; then
+                               filename="${2}"
+                               if [[ -d ${filename} ]]; then
+                                       filename+="/CMakeLists.txt"
+                                       if [[ ! -e ${filename} ]]; then
+                                               ewarn "You've given me nothing 
to work with in ${filename}!"
+                                               return
+                                       fi
+                               elif [[ ! -e ${filename} ]]; then
+                                       die "${FUNCNAME}: called on 
non-existing ${filename}"
+                               fi
+                       else
+                               die "${FUNCNAME}: bad number of arguments: -f 
<filename or directory> <subdirectory> expected"
+                       fi
+                       shift 2
+                       ;;
+               *)
+                       [[ -e ${filename} ]] || return
+                       ;;
+       esac
 
-       [[ -e "CMakeLists.txt" ]] || return
-
-       local d
        for d in $@; do
                d=${d//\//\\/}
-               sed -e 
"/add_subdirectory[[:space:]]*([[:space:]]*${d}[[:space:]]*)/I 
s/^/#DONOTCOMPILE /" \
-                       -i CMakeLists.txt || die "failed to comment 
add_subdirectory(${d})"
+               sed -e 
"/add_subdirectory[[:space:]]*([[:space:]]*${d}[[:space:]]*)/I s/^/#DONOTBUILD 
/" \
+                       -i ${filename} || die "failed to comment 
add_subdirectory(${d})"
        done
 }
 
-- 
2.51.2

signature.asc
Description: This is a digitally signed message part.