cmCommonTargetGenerator: Adopt Convert method

Move it up from cmMakefileTargetGenerator.
This commit is contained in:
Brad King 2015-07-08 15:49:03 -04:00
parent cdb5b65752
commit b2f51aef0d
3 changed files with 15 additions and 12 deletions

View File

@ -38,6 +38,14 @@ std::string const& cmCommonTargetGenerator::GetConfigName() const
return this->ConfigName; 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) const char* cmCommonTargetGenerator::GetFeature(const std::string& feature)
{ {

View File

@ -14,6 +14,8 @@
#include "cmStandardIncludes.h" #include "cmStandardIncludes.h"
#include "cmLocalGenerator.h"
class cmGeneratorTarget; class cmGeneratorTarget;
class cmGlobalCommonGenerator; class cmGlobalCommonGenerator;
class cmLocalCommonGenerator; class cmLocalCommonGenerator;
@ -52,6 +54,11 @@ protected:
// The windows module definition source file (.def), if any. // The windows module definition source file (.def), if any.
std::string ModuleDefinitionFile; std::string ModuleDefinitionFile;
std::string Convert(std::string const& source,
cmLocalGenerator::RelativeRoot relative,
cmLocalGenerator::OutputFormat output =
cmLocalGenerator::UNCHANGED);
}; };
#endif #endif

View File

@ -254,18 +254,6 @@ protected:
// Compute target-specific Fortran language flags. // Compute target-specific Fortran language flags.
void AddFortranFlags(std::string& 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 #endif