diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-08-27 11:50:29 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-09-19 19:36:12 (GMT) |
| commit | 21b5fdf9a39f739c3566f3e77a4c5244da1b7e3a (patch) | |
| tree | 84f85642a636657bda78c378e6c6e43ddf18ad49 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | f1d845ae74dd9ba0520b1f97c851e439f1c4df07 (diff) | |
| download | CMake-21b5fdf9a39f739c3566f3e77a4c5244da1b7e3a.zip CMake-21b5fdf9a39f739c3566f3e77a4c5244da1b7e3a.tar.gz CMake-21b5fdf9a39f739c3566f3e77a4c5244da1b7e3a.tar.bz2 | |
Convert: Avoid START_OUTPUT enum when converting to relative paths
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index d90ebf0..9443b0a 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -324,13 +324,13 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile() << "# The top level Makefile was generated from the following files:\n" << "set(CMAKE_MAKEFILE_DEPENDS\n" << " \"" - << lg->ConvertToRelativePath(cache, cmOutputConverter::START_OUTPUT) + << lg->ConvertToRelativePath(lg->GetCurrentBinaryDirectory(), cache) << "\"\n"; for (std::vector<std::string>::const_iterator i = lfiles.begin(); i != lfiles.end(); ++i) { cmakefileStream << " \"" << lg->ConvertToRelativePath( - *i, cmOutputConverter::START_OUTPUT) + lg->GetCurrentBinaryDirectory(), *i) << "\"\n"; } cmakefileStream << " )\n\n"; @@ -344,12 +344,12 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile() cmakefileStream << "# The corresponding makefile is:\n" << "set(CMAKE_MAKEFILE_OUTPUTS\n" << " \"" - << lg->ConvertToRelativePath(makefileName, - cmOutputConverter::START_OUTPUT) + << lg->ConvertToRelativePath(lg->GetCurrentBinaryDirectory(), + makefileName) << "\"\n" << " \"" - << lg->ConvertToRelativePath(check, - cmOutputConverter::START_OUTPUT) + << lg->ConvertToRelativePath(lg->GetCurrentBinaryDirectory(), + check) << "\"\n"; cmakefileStream << " )\n\n"; |