diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-08-27 13:50:30 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-09-19 21:36:13 +0200 |
| commit | 516e79ba2722adb662000773e742187815723702 (patch) | |
| tree | ee2e335fcc93bd82e44d9be7163f856b0c77295a | |
| parent | e13e519e1c3f76b826365b5fa72a50dba180c191 (diff) | |
| download | cmake-516e79ba2722adb662000773e742187815723702.tar.gz | |
Convert: Inline MAKERULE conversions
This is a trivial use of a static method.
| -rw-r--r-- | Source/cmDependsC.cxx | 3 | ||||
| -rw-r--r-- | Source/cmDependsFortran.cxx | 3 | ||||
| -rw-r--r-- | Source/cmExportBuildAndroidMKGenerator.cxx | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx index bc71aac6ae..619106ffd6 100644 --- a/Source/cmDependsC.cxx +++ b/Source/cmDependsC.cxx @@ -241,8 +241,7 @@ bool cmDependsC::WriteDependencies(const std::set<std::string>& sources, // directory. We must do the same here. std::string obj_i = this->LocalGenerator->ConvertToRelativePath( this->LocalGenerator->GetBinaryDirectory(), obj); - std::string obj_m = this->LocalGenerator->ConvertToOutputFormat( - obj_i, cmOutputConverter::MAKERULE); + std::string obj_m = cmSystemTools::ConvertToOutputPath(obj_i.c_str()); internalDepends << obj_i << std::endl; for (std::set<std::string>::const_iterator i = dependencies.begin(); diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index 925e385148..4a4acce894 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -333,8 +333,7 @@ bool cmDependsFortran::WriteDependenciesReal(const char* obj, // Write the include dependencies to the output stream. std::string obj_i = this->LocalGenerator->ConvertToRelativePath( this->LocalGenerator->GetBinaryDirectory(), obj); - std::string obj_m = this->LocalGenerator->ConvertToOutputFormat( - obj_i, cmOutputConverter::MAKERULE); + std::string obj_m = cmSystemTools::ConvertToOutputPath(obj_i.c_str()); internalDepends << obj_i << std::endl; internalDepends << " " << src << std::endl; for (std::set<std::string>::const_iterator i = info.Includes.begin(); diff --git a/Source/cmExportBuildAndroidMKGenerator.cxx b/Source/cmExportBuildAndroidMKGenerator.cxx index 96080a9a78..41d2f7a4b0 100644 --- a/Source/cmExportBuildAndroidMKGenerator.cxx +++ b/Source/cmExportBuildAndroidMKGenerator.cxx @@ -48,8 +48,8 @@ void cmExportBuildAndroidMKGenerator::GenerateImportTargetCode( os << "LOCAL_MODULE := "; os << targetName << "\n"; os << "LOCAL_SRC_FILES := "; - std::string path = target->GetLocalGenerator()->ConvertToOutputFormat( - target->GetFullPath(), cmOutputConverter::MAKERULE); + std::string path = + cmSystemTools::ConvertToOutputPath(target->GetFullPath().c_str()); os << path << "\n"; } |