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/cmMakefileTargetGenerator.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/cmMakefileTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 165f96c..215952a 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -173,7 +173,7 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules() for (std::vector<std::string>::const_iterator o = outputs.begin(); o != outputs.end(); ++o) { this->CleanFiles.push_back(this->LocalGenerator->ConvertToRelativePath( - *o, cmOutputConverter::START_OUTPUT)); + this->LocalGenerator->GetCurrentBinaryDirectory(), *o)); } } } @@ -313,7 +313,7 @@ void cmMakefileTargetGenerator::MacOSXContentGeneratorType::operator()( output += cmSystemTools::GetFilenameName(input); this->Generator->CleanFiles.push_back( this->Generator->LocalGenerator->ConvertToRelativePath( - output, cmOutputConverter::START_OUTPUT)); + this->Generator->LocalGenerator->GetCurrentBinaryDirectory(), output)); output = this->Generator->LocalGenerator->ConvertToRelativePath( output, cmOutputConverter::HOME_OUTPUT); @@ -1184,7 +1184,7 @@ void cmMakefileTargetGenerator::WriteObjectsVariable( this->ExternalObjects.begin(); i != this->ExternalObjects.end(); ++i) { object = this->LocalGenerator->ConvertToRelativePath( - *i, cmOutputConverter::START_OUTPUT); + this->LocalGenerator->GetCurrentBinaryDirectory(), *i); *this->BuildFileStream << " " << lineContinue << "\n" << this->Makefile->GetSafeDefinition( "CMAKE_OBJECT_NAME"); |