diff options
| author | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-11-11 20:30:51 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-11-11 20:30:51 +0000 |
| commit | c78b844e29ee14a237c646814c47be43257fe544 (patch) | |
| tree | da5d93558bbbd852d868174054282337f45f282a | |
| parent | 06057e06dcff4422d8b49729c2339cfda807faae (diff) | |
| parent | 01243361d06bf087535b26afa3c04ce5df24d630 (diff) | |
| download | kde-c78b844e29ee14a237c646814c47be43257fe544.tar.gz kde-c78b844e29ee14a237c646814c47be43257fe544.tar.bz2 kde-c78b844e29ee14a237c646814c47be43257fe544.zip | |
Merge updates from master
| -rw-r--r-- | eclass/cmake.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 069a332bd9a..d483d4b324c 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -223,11 +223,11 @@ cmake_run_in() { cmake_comment_add_subdirectory() { local d filename="CMakeLists.txt" if [[ $# -lt 1 ]]; then - die "${FUNCNAME} must be passed at least one subdirectory name to comment" + die "${FUNCNAME[0]} must be passed at least one subdirectory name to comment" fi case ${1} in -f) - if [[ $# -ge 2 ]]; then + if [[ $# -ge 3 ]]; then filename="${2}" if [[ -d ${filename} ]]; then filename+="/CMakeLists.txt" @@ -239,7 +239,7 @@ cmake_comment_add_subdirectory() { die "${FUNCNAME}: called on non-existing ${filename}" fi else - die "${FUNCNAME}: bad number of arguments: -f <filename or directory> <subdirectory> expected" + die "${FUNCNAME[0]}: bad number of arguments: -f <filename or directory> <subdirectory> expected" fi shift 2 ;; @@ -248,7 +248,7 @@ cmake_comment_add_subdirectory() { ;; esac - for d in $@; do + for d in "$@"; do d=${d//\//\\/} sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${d}[[:space:]]*)/I s/^/#DONOTBUILD /" \ -i ${filename} || die "failed to comment add_subdirectory(${d})" |