diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-26 18:36:07 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-26 18:36:07 (GMT) |
| commit | 0261bdfc1d041d949f96c4ebdd83f139d7338d71 (patch) | |
| tree | f0d94a5a4ead121a020ca39195acaed09962c0c7 /Source/cmNinjaTargetGenerator.cxx | |
| parent | 2fcb06039daa4492c05fa346465028ea0b3d4eff (diff) | |
| parent | 1703b00c7fc34f473e84f4ba29bdc73476637005 (diff) | |
| download | CMake-0261bdfc1d041d949f96c4ebdd83f139d7338d71.zip CMake-0261bdfc1d041d949f96c4ebdd83f139d7338d71.tar.gz CMake-0261bdfc1d041d949f96c4ebdd83f139d7338d71.tar.bz2 | |
Merge topic 'fix-COMPILE_DEFINITIONS-config'
1703b00 Test evaluation of per-config COMPILE_DEFINITIONS (#14037)
a6286e9 Fix the evaluation of per-config COMPILE_DEFINITIONS (#14037)
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 80a1a9b..3fb823c 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -228,7 +228,7 @@ ComputeDefines(cmSourceFile *source, const std::string& language) // Add preprocessor definitions for this target and configuration. this->LocalGenerator->AppendDefines (defines, - this->Target->GetCompileDefinitions()); + this->Target->GetCompileDefinitions(this->GetConfigName())); this->LocalGenerator->AppendDefines (defines, source->GetProperty("COMPILE_DEFINITIONS")); @@ -237,9 +237,6 @@ ComputeDefines(cmSourceFile *source, const std::string& language) defPropName += cmSystemTools::UpperCase(this->GetConfigName()); this->LocalGenerator->AppendDefines (defines, - this->Target->GetCompileDefinitions(this->GetConfigName())); - this->LocalGenerator->AppendDefines - (defines, source->GetProperty(defPropName.c_str())); } |