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/cmake.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/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index a5c8d46..077ea4d 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -531,8 +531,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args) } } else if (mode == "COMPILE") { std::string includes = mf->GetSafeDefinition("PACKAGE_INCLUDE_DIRS"); - std::vector<std::string> includeDirs; - cmExpandList(includes, includeDirs); + std::vector<std::string> includeDirs = cmExpandedList(includes); gg->CreateGenerationObjects(); cmLocalGenerator* lg = gg->LocalGenerators[0]; @@ -548,8 +547,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args) tgt->SetProperty("LINKER_LANGUAGE", language.c_str()); std::string libs = mf->GetSafeDefinition("PACKAGE_LIBRARIES"); - std::vector<std::string> libList; - cmExpandList(libs, libList); + std::vector<std::string> libList = cmExpandedList(libs); for (std::string const& lib : libList) { tgt->AddLinkLibrary(*mf, lib, GENERAL_LibraryType); } @@ -1264,8 +1262,7 @@ struct SaveCacheEntry int cmake::HandleDeleteCacheVariables(const std::string& var) { - std::vector<std::string> argsSplit; - cmExpandList(std::string(var), argsSplit, true); + std::vector<std::string> argsSplit = cmExpandedList(std::string(var), true); // erase the property to avoid infinite recursion this->State->SetGlobalProperty("__CMAKE_DELETE_CACHE_CHANGE_VARS_", ""); if (this->State->GetIsInTryCompile()) { |