From de722d7d63866613aaa8105b52ee90ffe2721136 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 6 Apr 2015 19:47:21 +0200 Subject: Move property initialization to cmState. --- Source/cmState.cxx | 1 + Source/cmake.cxx | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Source/cmState.cxx b/Source/cmState.cxx index e46846e..96f8a51 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -22,6 +22,7 @@ cmState::cmState(cmake* cm) : CMakeInstance(cm), IsInTryCompile(false) { + this->Initialize(); } cmState::~cmState() diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 7d02505..96b6a22 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -136,8 +136,6 @@ cmake::cmake() this->Policies = new cmPolicies(); this->State = new cmState(this); - this->InitializeProperties(); - #ifdef __APPLE__ struct rlimit rlp; if(!getrlimit(RLIMIT_STACK, &rlp)) @@ -186,14 +184,9 @@ cmake::~cmake() delete this->FileComparison; } -void cmake::InitializeProperties() -{ - this->State->Initialize(); -} - void cmake::CleanupCommandsAndMacros() { - this->InitializeProperties(); + this->State->Initialize(); this->State->RemoveUserDefinedCommands(); } -- cgit v0.12