diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-08-11 11:56:59 +0200 |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2019-08-14 16:33:20 +0200 |
| commit | f4f3c68926492e5660c4e66d5cdcf2298619c1b9 (patch) | |
| tree | a559edb65acf4fa1583c90031e81462258494d8d /Source/cmDepends.cxx | |
| parent | ff42dec89143c3b8027c9768c2910ca270ddd951 (diff) | |
| download | cmake-f4f3c68926492e5660c4e66d5cdcf2298619c1b9.tar.gz | |
Source code: Use cmExpandList instead of cmSystemTools::ExpandListArgument
Diffstat (limited to 'Source/cmDepends.cxx')
| -rw-r--r-- | Source/cmDepends.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx index ed76dbf47b..6623d9421f 100644 --- a/Source/cmDepends.cxx +++ b/Source/cmDepends.cxx @@ -7,6 +7,7 @@ #include "cmGeneratedFileStream.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" +#include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmsys/FStream.hxx" @@ -30,7 +31,7 @@ bool cmDepends::Write(std::ostream& makeDepends, std::ostream& internalDepends) { std::string const srcLang = "CMAKE_DEPENDS_CHECK_" + this->Language; cmMakefile* mf = this->LocalGenerator->GetMakefile(); - cmSystemTools::ExpandListArgument(mf->GetSafeDefinition(srcLang), pairs); + cmExpandList(mf->GetSafeDefinition(srcLang), pairs); } for (std::vector<std::string>::iterator si = pairs.begin(); si != pairs.end();) { @@ -241,7 +242,7 @@ void cmDepends::SetIncludePathFromLanguage(const std::string& lang) cmMakefile* mf = this->LocalGenerator->GetMakefile(); includePath = mf->GetDefinition(includePathVar); if (includePath) { - cmSystemTools::ExpandListArgument(includePath, this->IncludePath); + cmExpandList(includePath, this->IncludePath); } else { // Fallback to the old directory level variable if no per-target var: includePathVar = "CMAKE_"; @@ -249,7 +250,7 @@ void cmDepends::SetIncludePathFromLanguage(const std::string& lang) includePathVar += "_INCLUDE_PATH"; includePath = mf->GetDefinition(includePathVar); if (includePath) { - cmSystemTools::ExpandListArgument(includePath, this->IncludePath); + cmExpandList(includePath, this->IncludePath); } } } |