summaryrefslogtreecommitdiffstats
path: root/Source/cmSearchPath.cxx
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2019-08-23 14:17:39 (GMT)
committerSebastian Holtermann <sebholt@xwmw.org>2019-08-23 15:07:49 (GMT)
commitaaf59120bfd77a960317923da30e1a70ce0d8aae (patch)
tree9fba0f2e6c0157887ccf0848c3357dae58edee0a /Source/cmSearchPath.cxx
parent19612dffd27d90d73e3b7cff9cbba241294c17e9 (diff)
downloadCMake-aaf59120bfd77a960317923da30e1a70ce0d8aae.zip
CMake-aaf59120bfd77a960317923da30e1a70ce0d8aae.tar.gz
CMake-aaf59120bfd77a960317923da30e1a70ce0d8aae.tar.bz2
Source sweep: Replace cmExpandList with the shorter cmExpandedList
This replaces the code pattern ``` std::vector<std::string> args; cmExpandList(valueStr, args, ...) ``` with ``` std::vector<std::string> args = cmExpandedList(valueStr, ...) ```
Diffstat (limited to 'Source/cmSearchPath.cxx')
-rw-r--r--Source/cmSearchPath.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx
index affff54..d15ce57 100644
--- a/Source/cmSearchPath.cxx
+++ b/Source/cmSearchPath.cxx
@@ -78,8 +78,7 @@ void cmSearchPath::AddCMakePath(const std::string& variable)
// Get a path from a CMake variable.
if (const char* value = this->FC->Makefile->GetDefinition(variable)) {
- std::vector<std::string> expanded;
- cmExpandList(value, expanded);
+ std::vector<std::string> expanded = cmExpandedList(value);
for (std::string const& p : expanded) {
this->AddPathInternal(
@@ -103,8 +102,7 @@ void cmSearchPath::AddCMakePrefixPath(const std::string& variable)
// Get a path from a CMake variable.
if (const char* value = this->FC->Makefile->GetDefinition(variable)) {
- std::vector<std::string> expanded;
- cmExpandList(value, expanded);
+ std::vector<std::string> expanded = cmExpandedList(value);
this->AddPrefixPaths(
expanded, this->FC->Makefile->GetCurrentSourceDirectory().c_str());