diff options
author | Bruno Manganelli <bruno.manga95@gmail.com> | 2018-11-23 18:52:26 (GMT) |
---|---|---|
committer | Bruno Manganelli <bruno.manga95@gmail.com> | 2019-01-27 15:48:57 (GMT) |
commit | b6a957c9696706a338cdeef63540bf8a4c42d22d (patch) | |
tree | 48b0536c2d1ba352576910dcfb44490b75ffde92 /Source/cmDependsC.cxx | |
parent | 05e4fa47738bf44e8ee6501b415df2899b10f6da (diff) | |
download | CMake-b6a957c9696706a338cdeef63540bf8a4c42d22d.zip CMake-b6a957c9696706a338cdeef63540bf8a4c42d22d.tar.gz CMake-b6a957c9696706a338cdeef63540bf8a4c42d22d.tar.bz2 |
cmOutputConverter: move ConvertToRelativePath to cmStateDirectory.
Diffstat (limited to 'Source/cmDependsC.cxx')
-rw-r--r-- | Source/cmDependsC.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx index 072d116..dcf9cdf 100644 --- a/Source/cmDependsC.cxx +++ b/Source/cmDependsC.cxx @@ -100,7 +100,8 @@ bool cmDependsC::WriteDependencies(const std::set<std::string>& sources, // Compute a path to the object file to write to the internal depend file. // Any existing content of the internal depend file has already been // loaded in ValidDeps with this path as a key. - std::string obj_i = this->LocalGenerator->ConvertToRelativePath(binDir, obj); + std::string obj_i = + this->LocalGenerator->MaybeConvertToRelativePath(binDir, obj); if (this->ValidDeps != nullptr) { std::map<std::string, DependencyVector>::const_iterator tmpIt = @@ -234,7 +235,8 @@ bool cmDependsC::WriteDependencies(const std::set<std::string>& sources, for (std::string const& dep : dependencies) { makeDepends << obj_m << ": " << cmSystemTools::ConvertToOutputPath( - this->LocalGenerator->ConvertToRelativePath(binDir, dep)) + this->LocalGenerator->MaybeConvertToRelativePath(binDir, + dep)) << std::endl; internalDepends << " " << dep << std::endl; } |