kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2008-10-09 13:52:25 -04:00
parent 57a2a408c4
commit 0d425cd501
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmMakefile.cxx
View File

@ -120,6 +120,7 @@ cmMakefile::cmMakefile(const cmMakefile& mf)
this->SourceFileExtensions = mf.SourceFileExtensions; this->SourceFileExtensions = mf.SourceFileExtensions;
this->HeaderFileExtensions = mf.HeaderFileExtensions; this->HeaderFileExtensions = mf.HeaderFileExtensions;
this->DefineFlags = mf.DefineFlags; this->DefineFlags = mf.DefineFlags;
this->DefineFlagsOrig = mf.DefineFlagsOrig;
#if defined(CMAKE_BUILD_WITH_CMAKE) #if defined(CMAKE_BUILD_WITH_CMAKE)
this->SourceGroups = mf.SourceGroups; this->SourceGroups = mf.SourceGroups;
@ -1337,6 +1338,7 @@ void cmMakefile::InitializeFromParent()
// define flags // define flags
this->DefineFlags = parent->DefineFlags; this->DefineFlags = parent->DefineFlags;
this->DefineFlagsOrig = parent->DefineFlagsOrig;
// Include transform property. There is no per-config version. // Include transform property. There is no per-config version.
{ {