ENH: make sure properties are re-set on each configure

2 files changed, 18 insertions, 9 deletions

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c6b4052642..caf4f37f21 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -146,15 +146,7 @@ cmake::cmake()
   this->FileComparison = new cmFileTimeComparison;
 
   this->Policies = new cmPolicies();
-
-  this->Properties.SetCMakeInstance(this);
-
-  // initialize properties
-  cmSourceFile::DefineProperties(this);
-  cmTarget::DefineProperties(this);
-  cmMakefile::DefineProperties(this);
-  cmTest::DefineProperties(this);
-  cmake::DefineProperties(this);
+  this->InitializeProperties();
 
 #ifdef __APPLE__
   struct rlimit rlp;
@@ -224,8 +216,24 @@ cmake::~cmake()
   delete this->FileComparison;
 }
 
+void cmake::InitializeProperties()
+{
+  this->Properties.clear();
+  this->Properties.SetCMakeInstance(this);
+
+  // initialize properties
+  cmSourceFile::DefineProperties(this);
+  cmTarget::DefineProperties(this);
+  cmMakefile::DefineProperties(this);
+  cmTest::DefineProperties(this);
+  cmake::DefineProperties(this);
+  this->AccessedProperties.clear();
+  this->PropertyDefinitions.clear();
+}
+
 void cmake::CleanupCommandsAndMacros()
 {
+  this->InitializeProperties();
   std::vector<cmCommand*> commands;
   for(RegisteredCommandsMap::iterator j = this->Commands.begin();
       j != this->Commands.end(); ++j)
diff --git a/Source/cmake.h b/Source/cmake.h
index 416db7ff2b..cb130bcaa5 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -349,6 +349,7 @@ class cmake
       this->SuppressDevWarnings = v;
     }
 protected:
+  void InitializeProperties();
   int HandleDeleteCacheVariables(const char* var);
   cmPropertyMap Properties;
   std::set<std::pair<cmStdString,cmProperty::ScopeType> > AccessedProperties;