[Cmake-commits] [cmake-commits] king committed cmMakefile.cxx 1.442 1.443
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Mar 4 18:57:16 EST 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv21581/Source
Modified Files:
cmMakefile.cxx
Log Message:
BUG: Make sure at least one policy stack entry is created for every cmMakefile instance.
Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.442
retrieving revision 1.443
diff -C 2 -d -r1.442 -r1.443
*** cmMakefile.cxx 2 Mar 2008 14:11:26 -0000 1.442
--- cmMakefile.cxx 4 Mar 2008 23:57:14 -0000 1.443
***************
*** 47,50 ****
--- 47,53 ----
this->DefinitionStack.push_back(DefinitionMap());
+ // Enter a policy level for this directory.
+ this->PushPolicy();
+
// Setup the default include file regular expression (match everything).
this->IncludeFileRegularExpression = "^.*$";
***************
*** 3315,3319 ****
bool cmMakefile::PopPolicy()
{
! if (PolicyStack.size() == 0)
{
cmSystemTools::Error("Attempt to pop the policy stack past "
--- 3318,3322 ----
bool cmMakefile::PopPolicy()
{
! if (PolicyStack.size() == 1)
{
cmSystemTools::Error("Attempt to pop the policy stack past "
More information about the Cmake-commits
mailing list