[Cmake-commits] [cmake-commits] martink committed cmConfigureFileCommand.cxx 1.32 1.33 cmListFileCache.cxx 1.31 1.32 cmPolicies.cxx 1.11 1.12

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv25909/Source

Modified Files:
	cmConfigureFileCommand.cxx cmListFileCache.cxx cmPolicies.cxx 
Log Message:
BUG: change in handling of cmake_minimum_required


Index: cmConfigureFileCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmConfigureFileCommand.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -C 2 -d -r1.32 -r1.33
*** cmConfigureFileCommand.cxx	6 Mar 2008 15:57:08 -0000	1.32
--- cmConfigureFileCommand.cxx	6 Mar 2008 20:08:03 -0000	1.33
***************
*** 48,55 ****
      = this->Makefile->GetDefinition("CMAKE_BACKWARDS_COMPATIBILITY");
    if (versionValue && atof(versionValue) > 2.0)
!     {
      this->Immediate = true;
!     }
  
    
    this->AtOnly = false;
--- 48,66 ----
      = this->Makefile->GetDefinition("CMAKE_BACKWARDS_COMPATIBILITY");
    if (versionValue && atof(versionValue) > 2.0)
!   {
      this->Immediate = true;
!   }
  
+   switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP_0003))
+   {
+     case cmPolicies::WARN:
+     case cmPolicies::OLD:
+       break;
+     case cmPolicies::NEW:
+     case cmPolicies::REQUIRED_IF_USED:
+     case cmPolicies::REQUIRED_ALWAYS:
+       this->Immediate = true;
+   }
+     
    
    this->AtOnly = false;

Index: cmListFileCache.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmListFileCache.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -C 2 -d -r1.31 -r1.32
*** cmListFileCache.cxx	6 Mar 2008 15:57:17 -0000	1.31
--- cmListFileCache.cxx	6 Mar 2008 20:08:03 -0000	1.32
***************
*** 135,143 ****
          break;
        }
-       if (cmSystemTools::LowerCase(i->Name) == "cmake_minimum_required")
-       {
-         hasPolicy = true;
-         break;
-       }
      }
      // if no policy command is found this is an error
--- 135,138 ----
***************
*** 149,153 ****
        {
          mf->AddCacheDefinition
!           ("CMAKE_BACKWARDS_COMPATIBILITY", "2.6",
             "For backwards compatibility, what version of CMake commands and "
             "syntax should this version of CMake try to support.",
--- 144,148 ----
        {
          mf->AddCacheDefinition
!           ("CMAKE_BACKWARDS_COMPATIBILITY", "2.4",
             "For backwards compatibility, what version of CMake commands and "
             "syntax should this version of CMake try to support.",

Index: cmPolicies.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmPolicies.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** cmPolicies.cxx	6 Mar 2008 15:57:59 -0000	1.11
--- cmPolicies.cxx	6 Mar 2008 20:08:03 -0000	1.12
***************
*** 121,125 ****
      "configure the file right when the command is invoked."
      ,
!     2,2,0, cmPolicies::NEW);
  //  this->PolicyStringMap["CMP_CONFIGURE_FILE_IMMEDIATE"] = CMP_0003;
  
--- 121,125 ----
      "configure the file right when the command is invoked."
      ,
!     2,6,0, cmPolicies::NEW);
  //  this->PolicyStringMap["CMP_CONFIGURE_FILE_IMMEDIATE"] = CMP_0003;