diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-26 14:37:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-26 14:47:24 (GMT) |
| commit | 8685d0d2911f01fb7e2d26a2fd904dbf73712ce4 (patch) | |
| tree | 3b0f49d7be716d1f81b673971965ac31ad0ea43a /Source/cmCTest.cxx | |
| parent | 7290cea75bd0fe45e0862c6c3976caa3627be939 (diff) | |
| parent | aaf59120bfd77a960317923da30e1a70ce0d8aae (diff) | |
| download | CMake-8685d0d2911f01fb7e2d26a2fd904dbf73712ce4.zip CMake-8685d0d2911f01fb7e2d26a2fd904dbf73712ce4.tar.gz CMake-8685d0d2911f01fb7e2d26a2fd904dbf73712ce4.tar.bz2 | |
Merge topic 'source_sweep_cmExpandedList'
aaf59120bf Source sweep: Replace cmExpandList with the shorter cmExpandedList
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3725
Diffstat (limited to 'Source/cmCTest.cxx')
| -rw-r--r-- | Source/cmCTest.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index e654e74..7865ebb 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1448,8 +1448,7 @@ void cmCTest::AddSiteProperties(cmXMLWriter& xml) if (labels) { xml.StartElement("Labels"); std::string l = labels; - std::vector<std::string> args; - cmExpandList(l, args); + std::vector<std::string> args = cmExpandedList(l); for (std::string const& i : args) { xml.Element("Label", i); } @@ -1481,8 +1480,7 @@ std::vector<std::string> cmCTest::GetLabelsForSubprojects() { std::string labelsForSubprojects = this->GetCTestConfiguration("LabelsForSubprojects"); - std::vector<std::string> subprojects; - cmExpandList(labelsForSubprojects, subprojects); + std::vector<std::string> subprojects = cmExpandedList(labelsForSubprojects); // sort the array std::sort(subprojects.begin(), subprojects.end()); |