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/cmMakefile.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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index f101cdc..5f09ce3 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1112,7 +1112,7 @@ void cmMakefile::AddCustomCommandOldStyle( if (sf && !sf->GetPropertyAsBool("__CMAKE_RULE")) { cmTargetMap::iterator ti = this->Targets.find(target); if (ti != this->Targets.end()) { - ti->second.AddSource(sf->GetFullPath()); + ti->second.AddSource(sf->ResolveFullPath()); } else { cmSystemTools::Error("Attempt to add a custom rule to a target " "that does not exist yet for target " + @@ -3322,7 +3322,7 @@ void cmMakefile::AddTargetObject(std::string const& tgtName, sf->SetProperty("EXTERNAL_OBJECT", "1"); #if !defined(CMAKE_BOOTSTRAP) this->SourceGroups[this->ObjectLibrariesSourceGroupIndex].AddGroupFile( - sf->GetFullPath()); + sf->ResolveFullPath()); #endif } |