diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-03 13:37:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-03 13:40:44 (GMT) |
| commit | c4f2f011084a5e64e6f3745071ea56a286758682 (patch) | |
| tree | 2bbf7374e9d329b6203d0abee3a38fe394425978 /Source/cmLocalGenerator.cxx | |
| parent | 4684e64c84d49d9152ebab42c8bc4ffa57652041 (diff) | |
| parent | 2d888e339064d39ae894b4df567441539c8c65da (diff) | |
| download | CMake-c4f2f011084a5e64e6f3745071ea56a286758682.zip CMake-c4f2f011084a5e64e6f3745071ea56a286758682.tar.gz CMake-c4f2f011084a5e64e6f3745071ea56a286758682.tar.bz2 | |
Merge topic 'rename-mutating-getfullpath-overload'
2d888e3390 cmSourceFile: Rename mutating GetFullPath() overload
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3757
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 7177694..78133db 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1179,7 +1179,7 @@ void cmLocalGenerator::GetTargetFlags( if (sf->GetExtension() == "def") { linkFlags += defFlag; linkFlags += this->ConvertToOutputFormat( - cmSystemTools::CollapseFullPath(sf->GetFullPath()), SHELL); + cmSystemTools::CollapseFullPath(sf->ResolveFullPath()), SHELL); linkFlags += " "; } } @@ -1727,7 +1727,7 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName, // Check for a source file in this directory that matches the // dependency. if (cmSourceFile* sf = this->Makefile->GetSource(inName)) { - dep = sf->GetFullPath(); + dep = sf->ResolveFullPath(); return true; } |