diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-20 16:54:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-20 16:55:04 (GMT) |
| commit | 56a3e84a67bebd645914a65eea825aab365f88c7 (patch) | |
| tree | 6769c97af9ca458f89932fc58e935eef15103bd6 /Source/cmLocalGenerator.cxx | |
| parent | a44b83c138828039ff85443b4a3e631d79ce7e5b (diff) | |
| parent | 9d5a554cc9de0ac03d2da7dc95b8ef1db4a526e9 (diff) | |
| download | CMake-56a3e84a67bebd645914a65eea825aab365f88c7.zip CMake-56a3e84a67bebd645914a65eea825aab365f88c7.tar.gz CMake-56a3e84a67bebd645914a65eea825aab365f88c7.tar.bz2 | |
Merge topic 'realpath-cache'
9d5a554cc9 cmGlobalGenerator: Add cache for realpath() results
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4220
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index f13e18b..cedc3ad 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1171,7 +1171,7 @@ std::vector<BT<std::string>> cmLocalGenerator::GetIncludeDirectoriesImplicit( } for (std::string const& i : impDirVec) { - if (implicitSet.insert(cmSystemTools::GetRealPath(i)).second) { + if (implicitSet.insert(this->GlobalGenerator->GetRealPath(i)).second) { implicitDirs.emplace_back(i); } } @@ -1182,7 +1182,7 @@ std::vector<BT<std::string>> cmLocalGenerator::GetIncludeDirectoriesImplicit( &lang](std::string const& dir) { return ( // Do not exclude directories that are not in an excluded set. - ((!cmContains(implicitSet, cmSystemTools::GetRealPath(dir))) && + ((!cmContains(implicitSet, this->GlobalGenerator->GetRealPath(dir))) && (!cmContains(implicitExclude, dir))) // Do not exclude entries of the CPATH environment variable even though // they are implicitly searched by the compiler. They are meant to be |