diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2023-04-14 14:48:16 (GMT) |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2023-04-24 08:41:10 (GMT) |
| commit | e08ba229ee3107bcb814ca45bc9c72a48abf1ba2 (patch) | |
| tree | c34d2ca05820acbb31202c5bdbc102059441076b /Source/cmFindBase.cxx | |
| parent | 51b0d45d9120d4bca5c7285d5e6b2f80db5a8310 (diff) | |
| download | CMake-e08ba229ee3107bcb814ca45bc9c72a48abf1ba2.zip CMake-e08ba229ee3107bcb814ca45bc9c72a48abf1ba2.tar.gz CMake-e08ba229ee3107bcb814ca45bc9c72a48abf1ba2.tar.bz2 | |
CMake code rely on cmList class for CMake lists management (part. 1)
Diffstat (limited to 'Source/cmFindBase.cxx')
| -rw-r--r-- | Source/cmFindBase.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx index 4df81d5..929c6c1 100644 --- a/Source/cmFindBase.cxx +++ b/Source/cmFindBase.cxx @@ -15,6 +15,7 @@ #include "cmCMakePath.h" #include "cmExecutionStatus.h" +#include "cmList.h" #include "cmListFileCache.h" #include "cmMakefile.h" #include "cmMessageType.h" @@ -154,7 +155,7 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn) } // ensure a macro is not specified as validator const auto& validatorName = args[j]; - auto macros = cmExpandedList(this->Makefile->GetProperty("MACROS")); + cmList macros{ this->Makefile->GetProperty("MACROS") }; if (std::find_if(macros.begin(), macros.end(), [&validatorName](const std::string& item) { return cmSystemTools::Strucmp(validatorName.c_str(), @@ -403,7 +404,7 @@ void cmFindBase::FillCMakeSystemVariablePath() this->Makefile->GetDefinition("CMAKE_SYSTEM_PREFIX_PATH"); // remove entries from CMAKE_SYSTEM_PREFIX_PATH - std::vector<std::string> expanded = cmExpandedList(*prefix_paths); + cmList expanded{ *prefix_paths }; install_entry.remove_self(expanded); staging_entry.remove_self(expanded); |