[Cmake-commits] [cmake-commits] king committed cmFindPackageCommand.cxx 1.43 1.44

[cmake-commits at cmake.org]

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

Modified Files:
	cmFindPackageCommand.cxx 
Log Message:
ENH: Improve message for bad find_package call

Use the new-style error reporting mechanism to provide more context
information for a find_package call with a bad package name.  When the
package is not required, issue a warning instead of an error.


Index: cmFindPackageCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindPackageCommand.cxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -C 2 -d -r1.43 -r1.44
*** cmFindPackageCommand.cxx	7 Sep 2008 10:52:06 -0000	1.43
--- cmFindPackageCommand.cxx	8 Sep 2008 14:08:33 -0000	1.44
***************
*** 700,704 ****
      // The variable is not set.
      cmOStringStream e;
!     e << "could not find ";
      if(!this->NoModule)
        {
--- 700,704 ----
      // The variable is not set.
      cmOStringStream e;
!     e << "Could not find ";
      if(!this->NoModule)
        {
***************
*** 730,742 ****
          }
        }
!     if(this->Required)
!       {
!       this->SetError(e.str().c_str());
!       result = false;
!       }
!     else
!       {
!       cmSystemTools::Error("find_package ", e.str().c_str());
!       }
      }
  
--- 730,735 ----
          }
        }
!     this->Makefile->IssueMessage(
!       this->Required? cmake::FATAL_ERROR : cmake::WARNING, e.str());
      }