diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-08 13:54:05 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-08 13:54:05 -0400 |
| commit | f5690cc57c0cd18ee8619332379f523c8fac46a1 (patch) | |
| tree | 6b93d19bf93e344ee3a18b6d9941adbc3bd2331f /Source/cmMakefileTargetGenerator.cxx | |
| parent | d18852d5961584125ae113fae23f4b55a760e159 (diff) | |
| parent | f573bd22e4049746b53789fc0502cff8423dbe56 (diff) | |
| download | cmake-f5690cc57c0cd18ee8619332379f523c8fac46a1.tar.gz | |
Merge topic 'move-Feature-API'
f573bd22 cmLocalGenerator: Add Feature API from cmMakefile.
ccbc2259 cmGeneratorTarget: Move Feature API from cmTarget.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index c26bc601de..923aa7b3bd 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -2086,13 +2086,13 @@ void cmMakefileTargetGenerator::AddModuleDefinitionFlag(std::string& flags) //---------------------------------------------------------------------------- const char* cmMakefileTargetGenerator::GetFeature(const std::string& feature) { - return this->Target->GetFeature(feature, this->ConfigName); + return this->GeneratorTarget->GetFeature(feature, this->ConfigName); } //---------------------------------------------------------------------------- bool cmMakefileTargetGenerator::GetFeatureAsBool(const std::string& feature) { - return this->Target->GetFeatureAsBool(feature, this->ConfigName); + return this->GeneratorTarget->GetFeatureAsBool(feature, this->ConfigName); } //---------------------------------------------------------------------------- |