summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-08-27 19:01:20 +0200
committerStephen Kelly <steveire@gmail.com>2016-09-19 21:36:15 +0200
commit6429d6d9dd94523c75e982fa875028e3e32a0629 (patch)
treea372a3a65bca8a2ffba4ceef87bb43929a08bfa3
parentad79061720b8f68cd8e406aadd240d233d2a1073 (diff)
downloadcmake-6429d6d9dd94523c75e982fa875028e3e32a0629.tar.gz
cmOutputConverter: Remove now-obsolete Convert method
-rw-r--r--Source/cmCommonTargetGenerator.cxx7
-rw-r--r--Source/cmCommonTargetGenerator.h4
-rw-r--r--Source/cmOutputConverter.cxx23
-rw-r--r--Source/cmOutputConverter.h22
4 files changed, 0 insertions, 56 deletions
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index df682805e3..fdf0b0e874 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -47,13 +47,6 @@ std::string const& cmCommonTargetGenerator::GetConfigName() const
return this->ConfigName;
}
-std::string cmCommonTargetGenerator::Convert(
- std::string const& source, cmOutputConverter::RelativeRoot relative,
- cmOutputConverter::OutputFormat output)
-{
- return this->LocalGenerator->Convert(source, relative, output);
-}
-
const char* cmCommonTargetGenerator::GetFeature(const std::string& feature)
{
return this->GeneratorTarget->GetFeature(feature, this->ConfigName);
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index b433c18f37..4c52fe5db9 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -57,10 +57,6 @@ protected:
// The windows module definition source file (.def), if any.
cmSourceFile const* ModuleDefinitionFile;
- std::string Convert(std::string const& source,
- cmOutputConverter::RelativeRoot relative,
- cmOutputConverter::OutputFormat output);
-
void AppendFortranFormatFlags(std::string& flags,
cmSourceFile const& source);
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index dca0e1d31b..7f6edf2093 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -46,29 +46,6 @@ std::string cmOutputConverter::ConvertToOutputForExisting(
return this->ConvertToOutputFormat(remote, format);
}
-std::string cmOutputConverter::ConvertToRelativePath(
- const std::string& source, RelativeRoot relative) const
-{
- std::string result;
-
- switch (relative) {
- case START_OUTPUT:
- result = this->StateSnapshot.GetDirectory().GetCurrentBinary();
- break;
- }
-
- return this->ConvertToRelativePath(result, source);
-}
-
-std::string cmOutputConverter::Convert(const std::string& source,
- RelativeRoot relative,
- OutputFormat output) const
-{
- // Convert the path to a relative path.
- std::string result = this->ConvertToRelativePath(source, relative);
- return this->ConvertToOutputFormat(result, output);
-}
-
std::string cmOutputConverter::ConvertToOutputFormat(const std::string& source,
OutputFormat output) const
{
diff --git a/Source/cmOutputConverter.h b/Source/cmOutputConverter.h
index b2ae936fd2..cc24e53c41 100644
--- a/Source/cmOutputConverter.h
+++ b/Source/cmOutputConverter.h
@@ -24,24 +24,6 @@ class cmOutputConverter
public:
cmOutputConverter(cmState::Snapshot snapshot);
- /**
- * Convert something to something else. This is a centralized conversion
- * routine used by the generators to handle relative paths and the like.
- * The flags determine what is actually done.
- *
- * relative: treat the argument as a directory and convert it to make it
- * relative or full or unchanged. If relative (HOME, START etc) then that
- * specifies what it should be relative to.
- *
- * output: make the result suitable for output to a...
- *
- * optional: should any relative path operation be controlled by the rel
- * path setting
- */
- enum RelativeRoot
- {
- START_OUTPUT
- };
enum OutputFormat
{
SHELL,
@@ -50,10 +32,6 @@ public:
};
std::string ConvertToOutputFormat(const std::string& source,
OutputFormat output) const;
- std::string Convert(const std::string& remote, RelativeRoot local,
- OutputFormat output) const;
- std::string ConvertToRelativePath(const std::string& remote,
- RelativeRoot local) const;
std::string ConvertDirectorySeparatorsForShell(
const std::string& source) const;