diff options
author | Stephen Kelly <steveire@gmail.com> | 2016-08-27 11:44:56 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2016-08-27 13:26:37 (GMT) |
commit | 563ac22a1646f1287d1baac755e13cbe33c1fe7b (patch) | |
tree | d2f791c10703c3e89cc52ad5be566ec63fd9acc2 /Source/cmMakefileTargetGenerator.cxx | |
parent | 08be47cf939c3adfe653809c46c7b23b7a912a39 (diff) | |
download | CMake-563ac22a1646f1287d1baac755e13cbe33c1fe7b.zip CMake-563ac22a1646f1287d1baac755e13cbe33c1fe7b.tar.gz CMake-563ac22a1646f1287d1baac755e13cbe33c1fe7b.tar.bz2 |
Convert: Replace trivial conversion with new method
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 2d53669..b34cd6e 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -312,8 +312,10 @@ void cmMakefileTargetGenerator::MacOSXContentGeneratorType::operator()( output += "/"; output += cmSystemTools::GetFilenameName(input); this->Generator->CleanFiles.push_back( - this->Generator->Convert(output, cmOutputConverter::START_OUTPUT)); - output = this->Generator->Convert(output, cmOutputConverter::HOME_OUTPUT); + this->Generator->LocalGenerator->ConvertToRelativePath( + output, cmOutputConverter::START_OUTPUT)); + output = this->Generator->LocalGenerator->ConvertToRelativePath( + output, cmOutputConverter::HOME_OUTPUT); // Create a rule to copy the content into the bundle. std::vector<std::string> depends; @@ -1171,7 +1173,8 @@ void cmMakefileTargetGenerator::WriteObjectsVariable( for (std::vector<std::string>::const_iterator i = this->ExternalObjects.begin(); i != this->ExternalObjects.end(); ++i) { - object = this->Convert(*i, cmOutputConverter::START_OUTPUT); + object = this->LocalGenerator->ConvertToRelativePath( + *i, cmOutputConverter::START_OUTPUT); *this->BuildFileStream << " " << lineContinue << "\n" << this->Makefile->GetSafeDefinition( "CMAKE_OBJECT_NAME"); |