[Cmake-commits] [cmake-commits] king committed cmGlobalGenerator.cxx 1.226 1.227 cmIncludeDirectoryCommand.cxx 1.28 1.29

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalGenerator.cxx cmIncludeDirectoryCommand.cxx 
Log Message:
BUG: Fix crash when CMAKE_BACKWARDS_COMPATIBILITY is not set.


Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.226
retrieving revision 1.227
diff -C 2 -d -r1.226 -r1.227
*** cmGlobalGenerator.cxx	14 Feb 2008 21:42:29 -0000	1.226
--- cmGlobalGenerator.cxx	4 Mar 2008 23:41:52 -0000	1.227
***************
*** 465,471 ****
            // These files have a bunch of try compiles in them so
            // should only be done
!           const char* versionValue
!             = mf->GetDefinition("CMAKE_BACKWARDS_COMPATIBILITY");
!           if (atof(versionValue) <= 1.4)
              {
              if(strcmp(lang, "C") == 0)
--- 465,469 ----
            // These files have a bunch of try compiles in them so
            // should only be done
!           if (mf->NeedBackwardsCompatibility(1,4))
              {
              if(strcmp(lang, "C") == 0)

Index: cmIncludeDirectoryCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIncludeDirectoryCommand.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -C 2 -d -r1.28 -r1.29
*** cmIncludeDirectoryCommand.cxx	1 Mar 2008 20:20:35 -0000	1.28
--- cmIncludeDirectoryCommand.cxx	4 Mar 2008 23:41:52 -0000	1.29
***************
*** 51,59 ****
      if(i->size() == 0)
        {
-       const char* versionValue =
-         this->Makefile->GetDefinition("CMAKE_BACKWARDS_COMPATIBILITY");
        const char* errorMessage
          = "Empty Include Directory Passed into INCLUDE_DIRECTORIES command.";
!       if(atof(versionValue) < 2.5)
          {
          cmSystemTools::Error(errorMessage);
--- 51,57 ----
      if(i->size() == 0)
        {
        const char* errorMessage
          = "Empty Include Directory Passed into INCLUDE_DIRECTORIES command.";
!       if(this->Makefile->NeedBackwardsCompatibility(2,4))
          {
          cmSystemTools::Error(errorMessage);