diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-29 14:17:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-29 14:18:42 (GMT) |
| commit | 60c06620a690f0cbeeaa3fba762e19cd031669ca (patch) | |
| tree | c72e5f4bd45dc2a769e0c7f7bcbbfbd108f0e0f7 /Source/cmDependsC.cxx | |
| parent | 90ac5e6384735deb0ac523684010b2f4701d4f4d (diff) | |
| parent | b6a957c9696706a338cdeef63540bf8a4c42d22d (diff) | |
| download | CMake-60c06620a690f0cbeeaa3fba762e19cd031669ca.zip CMake-60c06620a690f0cbeeaa3fba762e19cd031669ca.tar.gz CMake-60c06620a690f0cbeeaa3fba762e19cd031669ca.tar.bz2 | |
Merge topic 'cmoutputconverter-simplify'
b6a957c969 cmOutputConverter: move ConvertToRelativePath to cmStateDirectory.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2831
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 ea24f09..2043d7c 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; } |