diff options
author | Brad King <brad.king@kitware.com> | 2020-03-18 18:22:11 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-03-24 14:10:06 (GMT) |
commit | 25f48761faad8308f23690a51030a49d05007391 (patch) | |
tree | 1f3ece02d09b79e7a6bab7b0fb4593323e5e66bd /Source/cmMakefileTargetGenerator.cxx | |
parent | 12b39aef7599a3ab6b1c1b9537d427839a9346b3 (diff) | |
download | CMake-25f48761faad8308f23690a51030a49d05007391.zip CMake-25f48761faad8308f23690a51030a49d05007391.tar.gz CMake-25f48761faad8308f23690a51030a49d05007391.tar.bz2 |
Simplify absolute path conversions using CollapseFullPath full signature
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 4389228..b70376e 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1245,8 +1245,10 @@ void cmMakefileTargetGenerator::GenerateCustomRuleFile( // Setup implicit dependency scanning. for (auto const& idi : ccg.GetCC().GetImplicitDepends()) { - std::string objFullPath = cmSystemTools::CollapseFullPath(outputs[0]); - std::string srcFullPath = cmSystemTools::CollapseFullPath(idi.second); + std::string objFullPath = cmSystemTools::CollapseFullPath( + outputs[0], this->LocalGenerator->GetCurrentBinaryDirectory()); + std::string srcFullPath = cmSystemTools::CollapseFullPath( + idi.second, this->LocalGenerator->GetCurrentBinaryDirectory()); this->LocalGenerator->AddImplicitDepends(this->GeneratorTarget, idi.first, objFullPath, srcFullPath); } |