diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-03-24 21:18:39 +0100 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-03-25 10:49:22 -0400 |
| commit | a6286e92c9be9f5b8ad8fb25b3c6e15c0ec17fa0 (patch) | |
| tree | 0b61fdbb1e961200371c01fe12fd5bda06b11874 /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | 8bffce955d2b906981779b39752a6836a7216c3c (diff) | |
| download | cmake-a6286e92c9be9f5b8ad8fb25b3c6e15c0ec17fa0.tar.gz | |
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/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index f6ab0d0519..0f680f6a15 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1962,7 +1962,6 @@ void cmLocalUnixMakefileGenerator3 // Build a list of preprocessor definitions for the target. std::set<std::string> defines; - this->AppendDefines(defines, target.GetCompileDefinitions()); this->AppendDefines(defines, target.GetCompileDefinitions( this->ConfigurationName.c_str())); if(!defines.empty()) |