From bbb507aebcb3559ae6e7d34ef02443e2d6ec3869 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Wed, 22 Jul 2015 20:52:02 +0200
Subject: [PATCH] cmMakefile: Move the InitializeFromParent method
---
Source/cmMakefile.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c54f97240b..9a28c7c494 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1554,13 +1554,13 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
// Initialize definitions with the closure of the parent scope.
this->Internal->InitializeDefinitions(parent);
+ this->StateSnapshot.InitializeFromParent();
+
this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
this->GetCurrentSourceDirectory());
this->AddDefinition("CMAKE_CURRENT_BINARY_DIR",
this->GetCurrentBinaryDirectory());
- this->StateSnapshot.InitializeFromParent();
-
this->SystemIncludeDirectories = parent->SystemIncludeDirectories;
// define flags
--
GitLab