diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-14 13:41:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-14 13:41:50 (GMT) |
| commit | 43c42e12c843b8478de9417d048c4c25e5458e4a (patch) | |
| tree | 5195a08baaa479c42c402282089831eeb7330f90 | |
| parent | e3c420a74fc528a8c0fb671f50d51df4e938c712 (diff) | |
| parent | 68bbec66e094e21bdace9607768895b0d381cc2c (diff) | |
| download | CMake-43c42e12c843b8478de9417d048c4c25e5458e4a.zip CMake-43c42e12c843b8478de9417d048c4c25e5458e4a.tar.gz CMake-43c42e12c843b8478de9417d048c4c25e5458e4a.tar.bz2 | |
Merge topic 'fileapi-link-fragments' into release-3.20
68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6220
| -rw-r--r-- | Source/cmFileAPICodemodel.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmFileAPICodemodel.cxx b/Source/cmFileAPICodemodel.cxx index 9061109..c96eecd 100644 --- a/Source/cmFileAPICodemodel.cxx +++ b/Source/cmFileAPICodemodel.cxx @@ -27,7 +27,7 @@ #include "cmInstallGenerator.h" #include "cmInstallSubdirectoryGenerator.h" #include "cmInstallTargetGenerator.h" -#include "cmLinkLineComputer.h" +#include "cmLinkLineComputer.h" // IWYU pragma: keep #include "cmListFileCache.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" @@ -1444,9 +1444,10 @@ Json::Value Target::DumpLinkCommandFragments() std::vector<BT<std::string>> linkPath; std::vector<BT<std::string>> linkLibs; cmLocalGenerator* lg = this->GT->GetLocalGenerator(); - cmLinkLineComputer linkLineComputer(lg, - lg->GetStateSnapshot().GetDirectory()); - lg->GetTargetFlags(&linkLineComputer, this->Config, linkLibs, + cmGlobalGenerator* gg = this->GT->GetGlobalGenerator(); + std::unique_ptr<cmLinkLineComputer> linkLineComputer = + gg->CreateLinkLineComputer(lg, lg->GetStateSnapshot().GetDirectory()); + lg->GetTargetFlags(linkLineComputer.get(), this->Config, linkLibs, linkLanguageFlags, linkFlags, frameworkPath, linkPath, this->GT); linkLanguageFlags = cmTrimWhitespace(linkLanguageFlags); |