Commit 0d425cd5 authored by Brad King's avatar Brad King
Browse files

BUG: Finish fix to old DEFINITIONS property

The cmMakefile::DefineFlagsOrig ivar was created to help preserve the
old DEFINITIONS property behavior now that definitions are moved from
DefineFlags to the COMPILE_DEFINITIONS directory property.  This fixes
propagation of the original value into subdirectories.
parent 57a2a408
......@@ -120,6 +120,7 @@ cmMakefile::cmMakefile(const cmMakefile& mf)
this->SourceFileExtensions = mf.SourceFileExtensions;
this->HeaderFileExtensions = mf.HeaderFileExtensions;
this->DefineFlags = mf.DefineFlags;
this->DefineFlagsOrig = mf.DefineFlagsOrig;
#if defined(CMAKE_BUILD_WITH_CMAKE)
this->SourceGroups = mf.SourceGroups;
......@@ -1337,6 +1338,7 @@ void cmMakefile::InitializeFromParent()
// define flags
this->DefineFlags = parent->DefineFlags;
this->DefineFlagsOrig = parent->DefineFlagsOrig;
// Include transform property. There is no per-config version.
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment