summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-10-24 12:27:06 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-10-24 12:27:21 (GMT)
commitb8e280dd93bec23eb07d57d4bba470547c25018a (patch)
treee2e11542429e78fdf54298e4951a170fbe49d0c8
parenta2c4b234f27423edbe5f2e0bb17b8275cf393017 (diff)
parent8bb949fc30677ea7a5c71b91f176dbbb12f15d5c (diff)
downloadCMake-b8e280dd93bec23eb07d57d4bba470547c25018a.zip
CMake-b8e280dd93bec23eb07d57d4bba470547c25018a.tar.gz
CMake-b8e280dd93bec23eb07d57d4bba470547c25018a.tar.bz2
Merge topic 'source_group-TREE-no-FILES'
8bb949fc30 source_group: Restore behavior of TREE with empty FILES Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8910
-rw-r--r--Source/cmSourceGroupCommand.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index 4b1685f..bb92856 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -280,8 +280,11 @@ static bool processTree(cmMakefile& mf, ParsedArguments& parsedArguments,
? ""
: parsedArguments[kPrefixOptionName].front();
- std::vector<std::string> files = parsedArguments[kFilesOptionName];
- if (files.empty()) {
+ std::vector<std::string> files;
+ auto filesArgIt = parsedArguments.find(kFilesOptionName);
+ if (filesArgIt != parsedArguments.end()) {
+ files = filesArgIt->second;
+ } else {
const std::vector<std::unique_ptr<cmSourceFile>>& srcFiles =
mf.GetSourceFiles();
for (const auto& srcFile : srcFiles) {