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/cmLocalVisualStudio6Generator.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/cmLocalVisualStudio6Generator.cxx')
-rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index c35288c..dc94476 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -1702,7 +1702,7 @@ void cmLocalVisualStudio6Generator this->AppendDefines( definesSet, - target.GetCompileDefinitions()); + target.GetCompileDefinitions(0)); this->AppendDefines( debugDefinesSet, target.GetCompileDefinitions("DEBUG")); |