diff options
-rw-r--r-- | Source/cmCommonTargetGenerator.cxx | 8 | ||||
-rw-r--r-- | Source/cmCommonTargetGenerator.h | 7 | ||||
-rw-r--r-- | Source/cmMakefileTargetGenerator.h | 12 |
3 files changed, 15 insertions, 12 deletions
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index 84a35a8..f79d993 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -38,6 +38,14 @@ std::string const& cmCommonTargetGenerator::GetConfigName() const return this->ConfigName; } +std::string cmCommonTargetGenerator::Convert( + std::string const& source, + cmLocalGenerator::RelativeRoot relative, + cmLocalGenerator::OutputFormat output) +{ + return this->LocalGenerator->Convert(source, relative, output); +} + //---------------------------------------------------------------------------- const char* cmCommonTargetGenerator::GetFeature(const std::string& feature) { diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h index deeb5ee..f8a7cf3 100644 --- a/Source/cmCommonTargetGenerator.h +++ b/Source/cmCommonTargetGenerator.h @@ -14,6 +14,8 @@ #include "cmStandardIncludes.h" +#include "cmLocalGenerator.h" + class cmGeneratorTarget; class cmGlobalCommonGenerator; class cmLocalCommonGenerator; @@ -52,6 +54,11 @@ protected: // The windows module definition source file (.def), if any. std::string ModuleDefinitionFile; + + std::string Convert(std::string const& source, + cmLocalGenerator::RelativeRoot relative, + cmLocalGenerator::OutputFormat output = + cmLocalGenerator::UNCHANGED); }; #endif diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h index d2d1df9..09f3c52 100644 --- a/Source/cmMakefileTargetGenerator.h +++ b/Source/cmMakefileTargetGenerator.h @@ -254,18 +254,6 @@ protected: // Compute target-specific Fortran language flags. void AddFortranFlags(std::string& flags); - - //================================================================== - // Convenience routines that do nothing more than forward to - // implementaitons - std::string Convert(const std::string& source, - cmLocalGenerator::RelativeRoot relative, - cmLocalGenerator::OutputFormat output = - cmLocalGenerator::UNCHANGED) - { - return this->LocalGenerator->Convert(source, relative, output); - } - }; #endif |