mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Genex: PlatformId now can match against a list of ids.

Browse Source
This commit is contained in:
Robert Maynard
2019-05-29 14:55:45 -04:00
committed by Brad King
parent ec66af2026
commit 9fd602bfd3
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGeneratorExpressionNode.cxx
View File

@@ -776,7 +776,7 @@ struct PlatformIdNode : public cmGeneratorExpressionNode
{
PlatformIdNode() {} // NOLINT(modernize-use-equals-default)
int NumExpectedParameters() const override { return OneOrZeroParameters; }
int NumExpectedParameters() const override { return ZeroOrMoreParameters; }
std::string Evaluate(
const std::vector<std::string>& parameters,
@@ -794,8 +794,10 @@ struct PlatformIdNode : public cmGeneratorExpressionNode
return parameters.front().empty() ? "1" : "0";
}
if (parameters.front() == platformId) {
return "1";
for (auto& param : parameters) {
if (param == platformId) {
return "1";
}
}
return "0";
}