diff options
| author | Brad King <brad.king@kitware.com> | 2008-10-09 17:52:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-10-09 17:52:25 (GMT) |
| commit | 0d425cd5018fbc034fe99099e5c2f4cf8901e430 (patch) | |
| tree | 1f8ed5896bf627547f330e7798e9253e5129965d | |
| parent | 57a2a408c4c626b0ca52ae33a8e266405eb40077 (diff) | |
| download | CMake-0d425cd5018fbc034fe99099e5c2f4cf8901e430.zip CMake-0d425cd5018fbc034fe99099e5c2f4cf8901e430.tar.gz CMake-0d425cd5018fbc034fe99099e5c2f4cf8901e430.tar.bz2 | |
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.
| -rw-r--r-- | Source/cmMakefile.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 12d8455..168afde 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. { |