From 0d425cd5018fbc034fe99099e5c2f4cf8901e430 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 9 Oct 2008 13:52:25 -0400 Subject: [PATCH] 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. --- Source/cmMakefile.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 12d8455d9..168afdec0 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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. {