[Cmake-commits] [cmake-commits] king committed cmMakefile.cxx 1.485 1.486

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv12157/Source

Modified Files:
	cmMakefile.cxx 
Log Message:
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.


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.485
retrieving revision 1.486
diff -C 2 -d -r1.485 -r1.486
*** cmMakefile.cxx	9 Oct 2008 15:00:54 -0000	1.485
--- cmMakefile.cxx	9 Oct 2008 17:52:25 -0000	1.486
***************
*** 121,124 ****
--- 121,125 ----
    this->HeaderFileExtensions = mf.HeaderFileExtensions;
    this->DefineFlags = mf.DefineFlags;
+   this->DefineFlagsOrig = mf.DefineFlagsOrig;
  
  #if defined(CMAKE_BUILD_WITH_CMAKE)
***************
*** 1338,1341 ****
--- 1339,1343 ----
    // define flags
    this->DefineFlags = parent->DefineFlags;
+   this->DefineFlagsOrig = parent->DefineFlagsOrig;
  
    // Include transform property.  There is no per-config version.