diff options
| author | Brad King <brad.king@kitware.com> | 2008-01-18 00:29:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-01-18 00:29:43 (GMT) |
| commit | 433099ecddb334cc6e43c6302594d7c713ef4d1e (patch) | |
| tree | 65b1ec804f8e0e40c5b0c7083cbf6e0913572b55 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | caca9b80652c7c36ed1e39e1faeec64e3397f632 (diff) | |
| download | CMake-433099ecddb334cc6e43c6302594d7c713ef4d1e.zip CMake-433099ecddb334cc6e43c6302594d7c713ef4d1e.tar.gz CMake-433099ecddb334cc6e43c6302594d7c713ef4d1e.tar.bz2 | |
ENH: Converted cmMakefile DefineFlags added by ADD_DEFINITIONS command into a COMPILE_DEFINITIONS directory property.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 35bc40e..89c9377 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1300,11 +1300,15 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, // Add the export symbol definition for shared library objects. this->AppendDefines(ppDefs, exportMacro); } + this->AppendDefines + (ppDefs, this->CurrentMakefile->GetProperty("COMPILE_DEFINITIONS")); this->AppendDefines(ppDefs, target.GetProperty("COMPILE_DEFINITIONS")); if(configName) { std::string defVarName = "COMPILE_DEFINITIONS_"; defVarName += cmSystemTools::UpperCase(configName); + this->AppendDefines + (ppDefs, this->CurrentMakefile->GetProperty(defVarName.c_str())); this->AppendDefines(ppDefs, target.GetProperty(defVarName.c_str())); } buildSettings->AddAttribute |