mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-07 06:09:52 -06:00
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:
@@ -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.
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user