summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2008-03-05 16:41:25 (GMT)
committerKen Martin <ken.martin@kitware.com>2008-03-05 16:41:25 (GMT)
commitf2c6e9e4809c9a85293bd9d01183c99c4598c403 (patch)
treed81943651ce0baea6912f13893817c28a9df3143 /Source/cmMakefile.cxx
parent7173f2db0e37a1621236b3ceeb883d4f1255ee42 (diff)
downloadCMake-f2c6e9e4809c9a85293bd9d01183c99c4598c403.zip
CMake-f2c6e9e4809c9a85293bd9d01183c99c4598c403.tar.gz
CMake-f2c6e9e4809c9a85293bd9d01183c99c4598c403.tar.bz2
BUG: some fixes, still a few to go
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 9d109b6..e1cf841 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -138,6 +138,7 @@ cmMakefile::cmMakefile(const cmMakefile& mf)
this->PreOrder = mf.PreOrder;
this->ListFileStack = mf.ListFileStack;
this->Initialize();
+ this->PushPolicy();
}
//----------------------------------------------------------------------------
@@ -207,6 +208,7 @@ cmMakefile::~cmMakefile()
delete b;
}
this->FunctionBlockers.clear();
+ this->PolicyStack.pop_back();
}
void cmMakefile::PrintStringVector(const char* s,
@@ -3245,7 +3247,7 @@ cmPolicies::PolicyStatus cmMakefile
bool done = false;
// check our policy stack first
- for (vecpos = static_cast<int>(this->PolicyStack.size());
+ for (vecpos = static_cast<int>(this->PolicyStack.size()) - 1;
vecpos >= 0 && !done; vecpos--)
{
mappos = this->PolicyStack[vecpos].find(id);