Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-21 06:10:16 +08:00
Code Issues Projects Releases Wiki Activity

GenEx: list oriented genexes use cmList class

Browse Source 
Fixes: #24654
This commit is contained in:
Marc Chevrier
2023-03-29 12:24:34 +02:00
parent 9f60f19ee9
commit 72d116ee68
1 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Source/cmGeneratorExpressionNode.cxx
View File

@@ -12,6 +12,7 @@
#include <memory> #include <memory>
#include <set> #include <set>
#include <sstream> #include <sstream>
#include <stdexcept>
#include <unordered_map> #include <unordered_map>
#include <utility> #include <utility>
@@ -25,7 +26,6 @@
#include "cmsys/RegularExpression.hxx" #include "cmsys/RegularExpression.hxx"
#include "cmsys/String.h" #include "cmsys/String.h"
#include "cmAlgorithms.h"
#include "cmCMakePath.h" #include "cmCMakePath.h"
#include "cmComputeLinkInformation.h" #include "cmComputeLinkInformation.h"
#include "cmGeneratorExpression.h" #include "cmGeneratorExpression.h"
@@ -35,6 +35,7 @@
#include "cmGeneratorTarget.h" #include "cmGeneratorTarget.h"
#include "cmGlobalGenerator.h" #include "cmGlobalGenerator.h"
#include "cmLinkItem.h" #include "cmLinkItem.h"
#include "cmList.h"
#include "cmLocalGenerator.h" #include "cmLocalGenerator.h"
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmMessageType.h" #include "cmMessageType.h"
@@ -291,18 +292,18 @@ static const struct InListNode : public cmGeneratorExpressionNode
const GeneratorExpressionContent* /*content*/, const GeneratorExpressionContent* /*content*/,
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const override cmGeneratorExpressionDAGChecker* /*dagChecker*/) const override
{ {
std::vector<std::string> values; cmList values;
std::vector<std::string> checkValues; cmList checkValues;
bool check = false; bool check = false;
switch (context->LG->GetPolicyStatus(cmPolicies::CMP0085)) { switch (context->LG->GetPolicyStatus(cmPolicies::CMP0085)) {
case cmPolicies::WARN: case cmPolicies::WARN:
if (parameters.front().empty()) { if (parameters.front().empty()) {
check = true; check = true;
cmExpandList(parameters[1], checkValues, true); checkValues.assign(parameters[1], cmList::EmptyElements::Yes);
} }
CM_FALLTHROUGH; CM_FALLTHROUGH;
case cmPolicies::OLD: case cmPolicies::OLD:
cmExpandList(parameters[1], values); values.assign(parameters[1]);
if (check && values != checkValues) { if (check && values != checkValues) {
std::ostringstream e; std::ostringstream e;
e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0085) e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0085)
@@ -319,11 +320,11 @@ static const struct InListNode : public cmGeneratorExpressionNode
case cmPolicies::REQUIRED_IF_USED: case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS: case cmPolicies::REQUIRED_ALWAYS:
case cmPolicies::NEW: case cmPolicies::NEW:
cmExpandList(parameters[1], values, true); values.assign(parameters[1], cmList::EmptyElements::Yes);
break; break;
} }
return cm::contains(values, parameters.front()) ? "1" : "0"; return values.find(parameters.front()) != cmList::npos ? "1" : "0";
} }
} inListNode; } inListNode;
@@ -352,24 +353,17 @@ static const struct FilterNode : public cmGeneratorExpressionNode
return {}; return {};
} }
const bool exclude = parameters[1] == "EXCLUDE"; try {
return cmList{ parameters.front(), cmList::EmptyElements::Yes }
cmsys::RegularExpression re; .filter(parameters[2],
if (!re.compile(parameters[2])) { parameters[1] == "EXCLUDE" ? cmList::FilterMode::EXCLUDE
: cmList::FilterMode::INCLUDE)
.to_string();
} catch (std::invalid_argument&) {
reportError(context, content->GetOriginalExpression(), reportError(context, content->GetOriginalExpression(),
"$<FILTER:...> failed to compile regex"); "$<FILTER:...> failed to compile regex");
return {}; return {};
} }
std::vector<std::string> values;
std::vector<std::string> result;
cmExpandList(parameters.front(), values, true);
std::copy_if(values.cbegin(), values.cend(), std::back_inserter(result),
[&re, exclude](std::string const& input) {
return exclude ^ re.find(input);
});
return cmJoin(cmMakeRange(result.cbegin(), result.cend()), ";");
} }
} filterNode; } filterNode;
@@ -391,11 +385,7 @@ static const struct RemoveDuplicatesNode : public cmGeneratorExpressionNode
"$<REMOVE_DUPLICATES:...> expression requires one parameter"); "$<REMOVE_DUPLICATES:...> expression requires one parameter");
} }
std::vector<std::string> values = cmExpandedList(parameters.front(), true); return cmList{ parameters.front() }.remove_duplicates().to_string();
auto valuesEnd = cmRemoveDuplicates(values);
auto valuesBegin = values.cbegin();
return cmJoin(cmMakeRange(valuesBegin, valuesEnd), ";");
} }
} removeDuplicatesNode; } removeDuplicatesNode;
@@ -1500,8 +1490,7 @@ static const struct JoinNode : public cmGeneratorExpressionNode
const GeneratorExpressionContent* /*content*/, const GeneratorExpressionContent* /*content*/,
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const override cmGeneratorExpressionDAGChecker* /*dagChecker*/) const override
{ {
std::vector<std::string> list = cmExpandedList(parameters.front()); return cmList{ parameters.front() }.join(parameters[1]);
return cmJoin(list, parameters[1]);
} }
} joinNode; } joinNode;