diff options
author | Stephen Kelly <steveire@gmail.com> | 2016-09-06 21:02:23 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2016-09-19 19:36:13 (GMT) |
commit | 34c6e995f9ac1c62540b68dd50934c8c0be98b7f (patch) | |
tree | d68b3f9c23b61a112f41cf3f6a8f2338f5cf03cb /Source/cmLocalUnixMakefileGenerator3.cxx | |
parent | 839c65bca032b80cfa7fe0de2ad35c2448421092 (diff) | |
download | CMake-34c6e995f9ac1c62540b68dd50934c8c0be98b7f.zip CMake-34c6e995f9ac1c62540b68dd50934c8c0be98b7f.tar.gz CMake-34c6e995f9ac1c62540b68dd50934c8c0be98b7f.tar.bz2 |
Convert: Avoid HOME_OUTPUT enum when converting to relative paths
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 9d3567e..6d2dac2 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -151,7 +151,7 @@ void cmLocalUnixMakefileGenerator3::ComputeHomeRelativeOutputPath() // Compute the path to use when referencing the current output // directory from the top output directory. this->HomeRelativeOutputPath = this->ConvertToRelativePath( - this->GetCurrentBinaryDirectory(), cmOutputConverter::HOME_OUTPUT); + this->GetBinaryDirectory(), this->GetCurrentBinaryDirectory()); if (this->HomeRelativeOutputPath == ".") { this->HomeRelativeOutputPath = ""; } @@ -1865,7 +1865,7 @@ void cmLocalUnixMakefileGenerator3::WriteDependLanguageInfo( i != includes.end(); ++i) { cmakefileStream << " \"" << this->ConvertToRelativePath( - *i, cmOutputConverter::HOME_OUTPUT) + this->GetBinaryDirectory(), *i) << "\"\n"; } cmakefileStream << " )\n"; @@ -1930,7 +1930,7 @@ std::string cmLocalUnixMakefileGenerator3::GetRecursiveMakeCall( if (!tgt.empty()) { // The make target is always relative to the top of the build tree. std::string tgt2 = - this->ConvertToRelativePath(tgt, cmOutputConverter::HOME_OUTPUT); + this->ConvertToRelativePath(this->GetBinaryDirectory(), tgt); // The target may have been written with windows paths. cmSystemTools::ConvertToOutputSlashes(tgt2); |