Commit 8bf38810 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

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

parent f64d3d0b
......@@ -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)
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment