diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-15 18:32:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-15 18:32:52 (GMT) |
| commit | 601af8f2b42400dcbcb8e90af867fa9fa3a0fb97 (patch) | |
| tree | 9e31a3b929550321791d183e1744edf84f3460da /Source/cmGeneratorTarget.cxx | |
| parent | f11b8342a0cae42b42e47428e34577f266fd314c (diff) | |
| parent | 22f38c0d6b482e99bb793f64c7701259dcf00bd7 (diff) | |
| download | CMake-601af8f2b42400dcbcb8e90af867fa9fa3a0fb97.zip CMake-601af8f2b42400dcbcb8e90af867fa9fa3a0fb97.tar.gz CMake-601af8f2b42400dcbcb8e90af867fa9fa3a0fb97.tar.bz2 | |
Merge topic 'avoid-getcwd'
22f38c0d6b cmake: avoid getcwd in `CollapseFullPath`
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4218
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 523083a..b3fb132 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -3086,7 +3086,8 @@ std::vector<BT<std::string>> cmGeneratorTarget::GetIncludeDirectories( cmLinkImplementationLibraries const* impl = this->GetLinkImplementationLibraries(config); for (cmLinkImplItem const& lib : impl->Libraries) { - std::string libDir = cmSystemTools::CollapseFullPath(lib.AsStr()); + std::string libDir = cmSystemTools::CollapseFullPath( + lib.AsStr(), this->Makefile->GetHomeOutputDirectory()); static cmsys::RegularExpression frameworkCheck( "(.*\\.framework)(/Versions/[^/]+)?/[^/]+$"); |