mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

target_sources(): Process multiple FILE_SET arguments per block

Browse Source 
Fixes: #23287
This commit is contained in:
Kyle Edwards
2022-03-03 13:07:10 -05:00
parent 04a7200c75
commit 8c23ecbd93
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Source/cmTargetSourcesCommand.cxx
View File

@@ -38,6 +38,14 @@ auto const FileSetArgsParser = cmArgumentParser<FileSetArgs>()
.Bind("BASE_DIRS"_s, &FileSetArgs::BaseDirs)
.Bind("FILES"_s, &FileSetArgs::Files);
struct FileSetsArgs
{
std::vector<std::vector<std::string>> FileSets;
};
auto const FileSetsArgsParser =
cmArgumentParser<FileSetsArgs>().Bind("FILE_SET"_s, &FileSetsArgs::FileSets);
class TargetSourcesImpl : public cmTargetPropCommandBase
{
public:
@@ -79,7 +87,7 @@ private:
bool prepend, bool system) override
{
if (!content.empty() && content.front() == "FILE_SET"_s) {
return this->HandleFileSetMode(scope, content, prepend, system);
return this->HandleFileSetMode(scope, content);
}
return this->cmTargetPropCommandBase::PopulateTargetProperties(
scope, content, prepend, system);
@@ -105,8 +113,9 @@ private:
IsInterface isInterfaceContent, CheckCMP0076 checkCmp0076);
bool HandleFileSetMode(const std::string& scope,
const std::vector<std::string>& content, bool prepend,
bool system);
const std::vector<std::string>& content);
bool HandleOneFileSet(const std::string& scope,
const std::vector<std::string>& content);
};
std::vector<std::string> TargetSourcesImpl::ConvertToAbsoluteContent(
@@ -186,8 +195,22 @@ std::vector<std::string> TargetSourcesImpl::ConvertToAbsoluteContent(
}
bool TargetSourcesImpl::HandleFileSetMode(
const std::string& scope, const std::vector<std::string>& content,
bool /*prepend*/, bool /*system*/)
const std::string& scope, const std::vector<std::string>& content)
{
auto args = FileSetsArgsParser.Parse(content);
for (auto& argList : args.FileSets) {
argList.emplace(argList.begin(), "FILE_SET"_s);
if (!this->HandleOneFileSet(scope, argList)) {
return false;
}
}
return true;
}
bool TargetSourcesImpl::HandleOneFileSet(
const std::string& scope, const std::vector<std::string>& content)
{
std::vector<std::string> unparsed;
auto args = FileSetArgsParser.Parse(content, &unparsed);