[Cmake-commits] [cmake-commits] king committed cmIncludeDirectoryCommand.cxx 1.29 1.30

[cmake-commits at cmake.org]

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

Modified Files:
	cmIncludeDirectoryCommand.cxx 
Log Message:
BUG: Fix include_directories command to produce an immediately whether or not 2.4 compatibility is enabled.  CMake 2.4 already produced an error, just not immediately.


Index: cmIncludeDirectoryCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIncludeDirectoryCommand.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -C 2 -d -r1.29 -r1.30
*** cmIncludeDirectoryCommand.cxx	4 Mar 2008 23:41:52 -0000	1.29
--- cmIncludeDirectoryCommand.cxx	8 Mar 2008 14:50:56 -0000	1.30
***************
*** 51,65 ****
      if(i->size() == 0)
        {
!       const char* errorMessage
!         = "Empty Include Directory Passed into INCLUDE_DIRECTORIES command.";
!       if(this->Makefile->NeedBackwardsCompatibility(2,4))
!         {
!         cmSystemTools::Error(errorMessage);
!         }
!       else
!         {
!         this->SetError(errorMessage);
!         return false;
!         }
        }
  
--- 51,56 ----
      if(i->size() == 0)
        {
!       this->SetError("given empty-string as include directory.");
!       return false;
        }