diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-09-17 09:45:40 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-09-19 13:32:13 (GMT) |
| commit | d1446ca7a0d1de4ede995d64deef057c741ef0c2 (patch) | |
| tree | 82e346c3c974e607081182bb3ddb86718a32b2e7 /Source/cmMakefileTargetGenerator.cxx | |
| parent | 290e92ada86c5b74669be48ee901494ae8e48ee3 (diff) | |
| download | CMake-d1446ca7a0d1de4ede995d64deef057c741ef0c2.zip CMake-d1446ca7a0d1de4ede995d64deef057c741ef0c2.tar.gz CMake-d1446ca7a0d1de4ede995d64deef057c741ef0c2.tar.bz2 | |
Append the COMPILE_DEFINITIONS from the Makefile to all targets.
This way we don't need to check the definitions from the Makefile when
generating later, and can more easily add generator expressions.
Duplication is not a problem as the definitions are de-duplicated before
generating.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 063a099..cde3299 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -302,15 +302,11 @@ std::string cmMakefileTargetGenerator::GetDefines(const std::string &l) // Add preprocessor definitions for this target and configuration. this->LocalGenerator->AppendDefines - (defines, this->Makefile->GetProperty("COMPILE_DEFINITIONS")); - this->LocalGenerator->AppendDefines (defines, this->Target->GetProperty("COMPILE_DEFINITIONS")); std::string defPropName = "COMPILE_DEFINITIONS_"; defPropName += cmSystemTools::UpperCase(this->LocalGenerator->ConfigurationName); this->LocalGenerator->AppendDefines - (defines, this->Makefile->GetProperty(defPropName.c_str())); - this->LocalGenerator->AppendDefines (defines, this->Target->GetProperty(defPropName.c_str())); std::string definesString; |