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/cmTarget.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/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index bc1b9de..fba0d23 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -88,8 +88,7 @@ const char* cmTargetPropertyComputer::GetSources<cmTarget>( std::ostringstream ss; const char* sep = ""; for (std::string const& entry : entries) { - std::vector<std::string> files; - cmExpandList(entry, files); + std::vector<std::string> files = cmExpandedList(entry); for (std::string const& file : files) { if (cmHasLiteralPrefix(file, "$<TARGET_OBJECTS:") && file.back() == '>') { @@ -499,8 +498,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, if (globals) { const std::string genName = mf->GetGlobalGenerator()->GetName(); if (cmHasLiteralPrefix(genName, "Visual Studio")) { - std::vector<std::string> props; - cmExpandList(globals, props); + std::vector<std::string> props = cmExpandedList(globals); const std::string vsGlobal = "VS_GLOBAL_"; for (const std::string& i : props) { // split NAME=VALUE @@ -742,8 +740,7 @@ public: bool operator()(std::string const& entry) { - std::vector<std::string> files; - cmExpandList(entry, files); + std::vector<std::string> files = cmExpandedList(entry); std::vector<cmSourceFileLocation> locations; locations.reserve(files.size()); std::transform(files.begin(), files.end(), std::back_inserter(locations), |