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/cmGlobalUnixMakefileGenerator3.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/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index caf71fd..5438375 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -356,8 +356,8 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile() for (std::vector<std::string>::const_iterator k = outfiles.begin(); k != outfiles.end(); ++k) { cmakefileStream << " \"" - << lg->ConvertToRelativePath( - *k, cmOutputConverter::HOME_OUTPUT) + << lg->ConvertToRelativePath(lg->GetBinaryDirectory(), + *k) << "\"\n"; } @@ -370,8 +370,8 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile() tmpStr += cmake::GetCMakeFilesDirectory(); tmpStr += "/CMakeDirectoryInformation.cmake"; cmakefileStream << " \"" - << lg->ConvertToRelativePath( - tmpStr, cmOutputConverter::HOME_OUTPUT) + << lg->ConvertToRelativePath(lg->GetBinaryDirectory(), + tmpStr) << "\"\n"; } cmakefileStream << " )\n\n"; @@ -532,7 +532,8 @@ void cmGlobalUnixMakefileGenerator3::GenerateBuildCommand( tname += "/fast"; } cmOutputConverter conv(mf->GetStateSnapshot()); - tname = conv.ConvertToRelativePath(tname, cmOutputConverter::HOME_OUTPUT); + tname = + conv.ConvertToRelativePath(mf->GetState()->GetBinaryDirectory(), tname); cmSystemTools::ConvertToOutputSlashes(tname); makeCommand.push_back(tname); if (this->Makefiles.empty()) { |