diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-08-16 18:50:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-16 18:51:03 (GMT) |
| commit | 2beed5a4ef66f415f4efa327a8c479395d262e52 (patch) | |
| tree | 48b1a8ad1a2fe87cb6a84de2b96379ebd7f78674 /Source/cmCTest.cxx | |
| parent | dcf2beb7dec757b7e28eba43fb7f2d5498bded39 (diff) | |
| parent | 2f6495e24e57cd4a03f38e615cc60177e89afb96 (diff) | |
| download | CMake-2beed5a4ef66f415f4efa327a8c479395d262e52.zip CMake-2beed5a4ef66f415f4efa327a8c479395d262e52.tar.gz CMake-2beed5a4ef66f415f4efa327a8c479395d262e52.tar.bz2 | |
Merge topic 'cmExpandList'
2f6495e24e cmSystemTools: Remove ExpandListArgument methods
f4f3c68926 Source code: Use cmExpandList instead of cmSystemTools::ExpandListArgument
ff42dec891 cmStringAlgorithms: Add cmExpandList functions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3682
Diffstat (limited to 'Source/cmCTest.cxx')
| -rw-r--r-- | Source/cmCTest.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 92ed839..4a5d2ce 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1454,7 +1454,7 @@ void cmCTest::AddSiteProperties(cmXMLWriter& xml) xml.StartElement("Labels"); std::string l = labels; std::vector<std::string> args; - cmSystemTools::ExpandListArgument(l, args); + cmExpandList(l, args); for (std::string const& i : args) { xml.Element("Label", i); } @@ -1487,7 +1487,7 @@ std::vector<std::string> cmCTest::GetLabelsForSubprojects() std::string labelsForSubprojects = this->GetCTestConfiguration("LabelsForSubprojects"); std::vector<std::string> subprojects; - cmSystemTools::ExpandListArgument(labelsForSubprojects, subprojects); + cmExpandList(labelsForSubprojects, subprojects); // sort the array std::sort(subprojects.begin(), subprojects.end()); @@ -2565,7 +2565,7 @@ void cmCTest::PopulateCustomVector(cmMakefile* mf, const std::string& def, cmCTestLog(this, DEBUG, "PopulateCustomVector: " << def << std::endl); vec.clear(); - cmSystemTools::ExpandListArgument(dval, vec); + cmExpandList(dval, vec); for (std::string const& it : vec) { cmCTestLog(this, DEBUG, " -- " << it << std::endl); |