commit: d224480df8358b5c4a7f0b22e80de8d338aa82f1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 29 21:54:01 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Dec 29 22:03:17 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d224480d
cmake.eclass: cmake_comment_add_subdirectory: Work w/ macro args As of 3.25, CMake allows 3 optional arguments to pass in addition to source_dir: [binary_dir] [EXCLUDE_FROM_ALL] [SYSTEM] The eclass function so far did not cope with that. See also: https://cmake.org/cmake/help/latest/command/add_subdirectory.html Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/cmake.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 6fa083b2ff..9260a7c07f 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -250,7 +250,7 @@ cmake_comment_add_subdirectory() { for d in "$@"; do d=${d//\//\\/} - sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${d}[[:space:]]*)/I s/^/#DONOTBUILD /" \ + sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${d}\([[:space:]][a-Z_ ]*\|[[:space:]]*\))/I s/^/#DONOTBUILD /" \ -i ${filename} || die "failed to comment add_subdirectory(${d})" done }
