diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-03-24 20:18:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-03-25 14:49:22 (GMT) |
| commit | a6286e92c9be9f5b8ad8fb25b3c6e15c0ec17fa0 (patch) | |
| tree | 0b61fdbb1e961200371c01fe12fd5bda06b11874 /Source/cmNinjaTargetGenerator.cxx | |
| parent | 8bffce955d2b906981779b39752a6836a7216c3c (diff) | |
| download | CMake-a6286e92c9be9f5b8ad8fb25b3c6e15c0ec17fa0.zip CMake-a6286e92c9be9f5b8ad8fb25b3c6e15c0ec17fa0.tar.gz CMake-a6286e92c9be9f5b8ad8fb25b3c6e15c0ec17fa0.tar.bz2 | |
Fix the evaluation of per-config COMPILE_DEFINITIONS (#14037)
The API for retrieving per-config COMPILE_DEFINITIONS has long
existed because of the COMPILE_DEFINITIONS_<CONFIG> style
properties. Ensure that the provided configuration being generated
is also used to evaluate the generator expressions
in cmTarget::GetCompileDefinitions.
Both the generic COMPILE_DEFINITIONS and the config-specific
variant need to be evaluated with the requested configuration. This
has the side-effect that the COMPILE_DEFINITIONS does not need to
be additionally evaluated with no configuration, so the callers can
be cleaned up a bit too.
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())); } |