kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert: Inline MAKERULE conversions 

This is a trivial use of a static method.
This commit is contained in:
Stephen Kelly 2016-08-27 13:50:30 +02:00
parent e13e519e1c
commit 516e79ba27
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmDependsC.cxx
View File

@ -241,8 +241,7 @@ bool cmDependsC::WriteDependencies(const std::set<std::string>& sources,
// directory. We must do the same here. // directory. We must do the same here.
std::string obj_i = this->LocalGenerator->ConvertToRelativePath( std::string obj_i = this->LocalGenerator->ConvertToRelativePath(
this->LocalGenerator->GetBinaryDirectory(), obj); this->LocalGenerator->GetBinaryDirectory(), obj);
std::string obj_m = this->LocalGenerator->ConvertToOutputFormat( std::string obj_m = cmSystemTools::ConvertToOutputPath(obj_i.c_str());
obj_i, cmOutputConverter::MAKERULE);
internalDepends << obj_i << std::endl; internalDepends << obj_i << std::endl;
for (std::set<std::string>::const_iterator i = dependencies.begin(); for (std::set<std::string>::const_iterator i = dependencies.begin();

3
Source/cmDependsFortran.cxx
View File

@ -333,8 +333,7 @@ bool cmDependsFortran::WriteDependenciesReal(const char* obj,
// Write the include dependencies to the output stream. // Write the include dependencies to the output stream.
std::string obj_i = this->LocalGenerator->ConvertToRelativePath( std::string obj_i = this->LocalGenerator->ConvertToRelativePath(
this->LocalGenerator->GetBinaryDirectory(), obj); this->LocalGenerator->GetBinaryDirectory(), obj);
std::string obj_m = this->LocalGenerator->ConvertToOutputFormat( std::string obj_m = cmSystemTools::ConvertToOutputPath(obj_i.c_str());
obj_i, cmOutputConverter::MAKERULE);
internalDepends << obj_i << std::endl; internalDepends << obj_i << std::endl;
internalDepends << " " << src << std::endl; internalDepends << " " << src << std::endl;
for (std::set<std::string>::const_iterator i = info.Includes.begin(); for (std::set<std::string>::const_iterator i = info.Includes.begin();

4
Source/cmExportBuildAndroidMKGenerator.cxx
View File

@ -48,8 +48,8 @@ void cmExportBuildAndroidMKGenerator::GenerateImportTargetCode(
os << "LOCAL_MODULE := "; os << "LOCAL_MODULE := ";
os << targetName << "\n"; os << targetName << "\n";
os << "LOCAL_SRC_FILES := "; os << "LOCAL_SRC_FILES := ";
std::string path = target->GetLocalGenerator()->ConvertToOutputFormat( std::string path =
target->GetFullPath(), cmOutputConverter::MAKERULE); cmSystemTools::ConvertToOutputPath(target->GetFullPath().c_str());
os << path << "\n"; os << path << "\n";
} }