diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-09-17 17:56:50 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-09-19 13:32:19 (GMT) |
| commit | c31f3d99f8adc95c355f8607bdfccf01cc37c51d (patch) | |
| tree | b7eadc1c88e22a045c42bd66b51a15c486559ba6 /Source/cmMakefileTargetGenerator.cxx | |
| parent | d1446ca7a0d1de4ede995d64deef057c741ef0c2 (diff) | |
| download | CMake-c31f3d99f8adc95c355f8607bdfccf01cc37c51d.zip CMake-c31f3d99f8adc95c355f8607bdfccf01cc37c51d.tar.gz CMake-c31f3d99f8adc95c355f8607bdfccf01cc37c51d.tar.bz2 | |
Add a wrapper for accessing config-specific compile-definitions.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index cde3299..9560c10 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -302,12 +302,11 @@ std::string cmMakefileTargetGenerator::GetDefines(const std::string &l) // Add preprocessor definitions for this target and configuration. this->LocalGenerator->AppendDefines - (defines, this->Target->GetProperty("COMPILE_DEFINITIONS")); - std::string defPropName = "COMPILE_DEFINITIONS_"; - defPropName += - cmSystemTools::UpperCase(this->LocalGenerator->ConfigurationName); + (defines, this->GeneratorTarget->GetCompileDefinitions()); + this->LocalGenerator->AppendDefines - (defines, this->Target->GetProperty(defPropName.c_str())); + (defines, this->GeneratorTarget->GetCompileDefinitions( + this->LocalGenerator->ConfigurationName.c_str())); std::string definesString; this->LocalGenerator->JoinDefines(defines, definesString, lang); |