diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-06 17:47:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-15 15:43:50 (GMT) |
| commit | de722d7d63866613aaa8105b52ee90ffe2721136 (patch) | |
| tree | 4a932bce34fc143f5d69e811c764edc55c8cf960 /Source | |
| parent | 9b5f80a83c07b4c840b190f4f9057f2cf0fa03d4 (diff) | |
| download | CMake-de722d7d63866613aaa8105b52ee90ffe2721136.zip CMake-de722d7d63866613aaa8105b52ee90ffe2721136.tar.gz CMake-de722d7d63866613aaa8105b52ee90ffe2721136.tar.bz2 | |
Move property initialization to cmState.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmState.cxx | 1 | ||||
| -rw-r--r-- | 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(); } |