[cmake-commits] alex committed FindASPELL.cmake 1.2 1.3 FindBZip2.cmake 1.2 1.3 FindBoost.cmake 1.1 1.2 FindCURL.cmake 1.3 1.4 FindCurses.cmake 1.7 1.8 FindEXPAT.cmake 1.2 1.3 FindGnuplot.cmake 1.4 1.5 FindHSPELL.cmake 1.2 1.3 FindJPEG.cmake 1.13 1.14 FindJasper.cmake 1.2 1.3 FindLibXml2.cmake 1.3 1.4 FindLibXslt.cmake 1.2 1.3 FindMPEG.cmake 1.6 1.7 FindMPEG2.cmake 1.7 1.8 FindMotif.cmake 1.4 1.5 FindOpenAL.cmake 1.5 1.6 FindPNG.cmake 1.16 1.17 FindPackageHandleStandardArgs.cmake 1.1 1.2 FindPerl.cmake 1.10 1.11 FindPerlLibs.cmake 1.6 1.7 FindPhysFS.cmake 1.5 1.6 FindPythonInterp.cmake 1.7 1.8 FindPythonLibs.cmake 1.32 1.33 FindSDL.cmake 1.11 1.12 FindTCL.cmake 1.43 1.44 FindTIFF.cmake 1.10 1.11 FindTclsh.cmake 1.12 1.13 FindWget.cmake 1.8 1.9 FindZLIB.cmake 1.10 1.11

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jul 23 09:49:55 EDT 2007 

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv23674

Modified Files:
	FindASPELL.cmake FindBZip2.cmake FindBoost.cmake 
	FindCURL.cmake FindCurses.cmake FindEXPAT.cmake 
	FindGnuplot.cmake FindHSPELL.cmake FindJPEG.cmake 
	FindJasper.cmake FindLibXml2.cmake FindLibXslt.cmake 
	FindMPEG.cmake FindMPEG2.cmake FindMotif.cmake 
	FindOpenAL.cmake FindPNG.cmake 
	FindPackageHandleStandardArgs.cmake FindPerl.cmake 
	FindPerlLibs.cmake FindPhysFS.cmake FindPythonInterp.cmake 
	FindPythonLibs.cmake FindSDL.cmake FindTCL.cmake 
	FindTIFF.cmake FindTclsh.cmake FindWget.cmake FindZLIB.cmake 
Log Message:

ENH: add second failure message parameter to
FIND_PACKAGE_HANDLE_STANDARD_ARGS(), so cmake modules can specify their own
better failure messages. If the default is ok use "DEFAULT_MSG".
Do this also for FindBoost.cmake (#5349)

Alex


Index: FindPythonInterp.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonInterp.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- FindPythonInterp.cmake	18 Jul 2007 17:56:45 -0000	1.7
+++ FindPythonInterp.cmake	23 Jul 2007 13:49:52 -0000	1.8
@@ -22,4 +22,4 @@
 # handle the QUIETLY and REQUIRED arguments and set PYTHONINTERP_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonInterp PYTHON_EXECUTABLE)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonInterp DEFAULT_MSG PYTHON_EXECUTABLE)

Index: FindCURL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCURL.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FindCURL.cmake	19 Jul 2007 13:00:51 -0000	1.3
+++ FindCURL.cmake	23 Jul 2007 13:49:52 -0000	1.4
@@ -16,7 +16,7 @@
 # handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL CURL_LIBRARY CURL_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL DEFAULT_MSG CURL_LIBRARY CURL_INCLUDE_DIR)
 
 IF(CURL_FOUND)
   SET(CURL_LIBRARIES ${CURL_LIBRARY})

Index: FindLibXml2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLibXml2.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FindLibXml2.cmake	18 Jul 2007 17:26:02 -0000	1.3
+++ FindLibXml2.cmake	23 Jul 2007 13:49:52 -0000	1.4
@@ -40,7 +40,7 @@
 
 # handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if 
 # all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
 
 MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
 

Index: FindPerl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPerl.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- FindPerl.cmake	19 Jul 2007 13:00:51 -0000	1.10
+++ FindPerl.cmake	23 Jul 2007 13:49:52 -0000	1.11
@@ -21,6 +21,6 @@
 # handle the QUIETLY and REQUIRED arguments and set PERL_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Perl PERL_EXECUTABLE)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Perl DEFAULT_MSG PERL_EXECUTABLE)
 
 MARK_AS_ADVANCED( PERL_EXECUTABLE )

Index: FindCurses.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCurses.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- FindCurses.cmake	19 Jul 2007 13:00:51 -0000	1.7
+++ FindCurses.cmake	23 Jul 2007 13:49:52 -0000	1.8
@@ -26,7 +26,7 @@
 # handle the QUIETLY and REQUIRED arguments and set CURSES_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses CURSES_LIBRARY CURSES_INCLUDE_PATH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses DEFAULT_MSG CURSES_LIBRARY CURSES_INCLUDE_PATH)
 
 
 MARK_AS_ADVANCED(

Index: FindTIFF.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTIFF.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- FindTIFF.cmake	18 Jul 2007 17:56:45 -0000	1.10
+++ FindTIFF.cmake	23 Jul 2007 13:49:52 -0000	1.11
@@ -15,7 +15,7 @@
 # handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(TIFF TIFF_LIBRARY TIFF_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TIFF DEFAULT_MSG TIFF_LIBRARY TIFF_INCLUDE_DIR)
 
 IF(TIFF_FOUND)
   SET( TIFF_LIBRARIES ${TIFF_LIBRARY} )

Index: FindMPEG2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPEG2.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- FindMPEG2.cmake	19 Jul 2007 13:00:51 -0000	1.7
+++ FindMPEG2.cmake	23 Jul 2007 13:49:52 -0000	1.8
@@ -23,7 +23,7 @@
 # handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR)
 
 IF(MPEG2_FOUND)
   SET( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY} 

Index: FindTclsh.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTclsh.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- FindTclsh.cmake	19 Jul 2007 13:00:51 -0000	1.12
+++ FindTclsh.cmake	23 Jul 2007 13:49:52 -0000	1.13
@@ -35,6 +35,6 @@
 # handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tclsh TCL_TCLSH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tclsh DEFAULT_MSG TCL_TCLSH)
 
 MARK_AS_ADVANCED( TCL_TCLSH  )

Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- FindPythonLibs.cmake	19 Jul 2007 15:59:04 -0000	1.32
+++ FindPythonLibs.cmake	23 Jul 2007 13:49:52 -0000	1.33
@@ -83,7 +83,7 @@
 
 
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs PYTHON_LIBRARIES PYTHON_INCLUDE_PATH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs DEFAULT_MSG PYTHON_LIBRARIES PYTHON_INCLUDE_PATH)
 
 
 GET_TARGET_PROPERTY(_FIND_PYTHONLIBS_ALREADY_INCLUDED __FindPythonLibsHelper TYPE)

Index: FindASPELL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindASPELL.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FindASPELL.cmake	19 Jul 2007 13:00:51 -0000	1.2
+++ FindASPELL.cmake	23 Jul 2007 13:49:52 -0000	1.3
@@ -24,7 +24,7 @@
 # handle the QUIETLY and REQUIRED arguments and set ASPELL_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ASPELL ASPELL_LIBRARIES ASPELL_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ASPELL DEFAULT_MSG ASPELL_LIBRARIES ASPELL_INCLUDE_DIR)
 
 
 MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARIES)

Index: FindZLIB.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindZLIB.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- FindZLIB.cmake	18 Jul 2007 17:56:45 -0000	1.10
+++ FindZLIB.cmake	23 Jul 2007 13:49:52 -0000	1.11
@@ -19,7 +19,7 @@
 # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
 
 IF(ZLIB_FOUND)
   SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )

Index: FindEXPAT.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindEXPAT.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FindEXPAT.cmake	19 Jul 2007 13:00:51 -0000	1.2
+++ FindEXPAT.cmake	23 Jul 2007 13:49:52 -0000	1.3
@@ -14,7 +14,7 @@
 # handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(EXPAT EXPAT_LIBRARY EXPAT_INCLUDE_PATH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(EXPAT DEFAULT_MSG EXPAT_LIBRARY EXPAT_INCLUDE_PATH)
 
 # Copy the results to the output variables.
 IF(EXPAT_FOUND)

Index: FindPerlLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPerlLibs.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FindPerlLibs.cmake	18 Jul 2007 17:56:45 -0000	1.6
+++ FindPerlLibs.cmake	23 Jul 2007 13:49:52 -0000	1.7
@@ -55,7 +55,7 @@
 # handle the QUIETLY and REQUIRED arguments and set PERLLIBS_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PerlLibs PERL_LIBRARY PERL_INCLUDE_PATH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PerlLibs DEFAULT_MSG PERL_LIBRARY PERL_INCLUDE_PATH)
 
 
 MARK_AS_ADVANCED(

Index: FindHSPELL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindHSPELL.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FindHSPELL.cmake	19 Jul 2007 13:00:51 -0000	1.2
+++ FindHSPELL.cmake	23 Jul 2007 13:49:52 -0000	1.3
@@ -25,7 +25,7 @@
 # handle the QUIETLY and REQUIRED arguments and set HSPELL_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(HSPELL HSPELL_LIBRARIES HSPELL_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(HSPELL DEFAULT_MSG HSPELL_LIBRARIES HSPELL_INCLUDE_DIR)
 
 
 MARK_AS_ADVANCED(HSPELL_INCLUDE_DIR HSPELL_LIBRARIES)

Index: FindWget.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindWget.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- FindWget.cmake	19 Jul 2007 13:00:51 -0000	1.8
+++ FindWget.cmake	23 Jul 2007 13:49:52 -0000	1.9
@@ -14,7 +14,7 @@
 # handle the QUIETLY and REQUIRED arguments and set WGET_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Wget WGET_EXECUTABLE)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Wget DEFAULT_MSG WGET_EXECUTABLE)
 
 MARK_AS_ADVANCED( WGET_EXECUTABLE )
 

Index: FindSDL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL.cmake,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- FindSDL.cmake	19 Jul 2007 13:00:51 -0000	1.11
+++ FindSDL.cmake	23 Jul 2007 13:49:52 -0000	1.12
@@ -137,6 +137,6 @@
 # handle the QUIETLY and REQUIRED arguments and set SDL_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL SDL_LIBRARY_TEMP)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL DEFAULT_MSG SDL_LIBRARY_TEMP)
 
 MARK_AS_ADVANCED(SDL_LIBRARY_TEMP)

Index: FindPackageHandleStandardArgs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPackageHandleStandardArgs.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindPackageHandleStandardArgs.cmake	18 Jul 2007 17:26:02 -0000	1.1
+++ FindPackageHandleStandardArgs.cmake	23 Jul 2007 13:49:52 -0000	1.2
@@ -1,20 +1,30 @@
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME VAR ... )
+# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... )
 #    This macro is intended to be used in FindXXX.cmake modules files.
 #    It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and
 #    it also sets the <UPPERCASED_NAME>_FOUND variable.
 #    The package is found if all variables listed are TRUE.
 #    Example:
 #
-#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
 #
 #    LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and 
 #    LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set tto TRUE.
 #    If it is not found and REQUIRED was used, it fails with FATAL_ERROR, 
 #    independent whether QUIET was used or not.
-#    If it is found, the location is reported using the VAR argument, so 
+#    If it is found, the location is reported using the VAR1 argument, so 
 #    here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out.
+#    If the second argument is DEFAULT_MSG, the message in the failure case will 
+#    be "Could NOT find LibXml2", if you don't like this message you can specify
+#    your own custom failure message there.
+
+MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 )
+
+  IF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+    SET(_FAIL_MESSAGE "Could NOT find ${_NAME}")
+  ELSE("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+    SET(_FAIL_MESSAGE "${_FAIL_MSG}")
+  ENDIF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
 
-MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _VAR1 )
   STRING(TOUPPER ${_NAME} _NAME_UPPER)
 
   SET(${_NAME_UPPER}_FOUND TRUE)
@@ -34,10 +44,10 @@
     ENDIF (NOT ${_NAME}_FIND_QUIETLY)
   ELSE (${_NAME_UPPER}_FOUND)
     IF (${_NAME}_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "Could NOT find ${_NAME}")
+        MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}")
     ELSE (${_NAME}_FIND_REQUIRED)
       IF (NOT ${_NAME}_FIND_QUIETLY)
-        MESSAGE(STATUS "Could NOT find ${_NAME}")
+        MESSAGE(STATUS "${_FAIL_MESSAGE}")
       ENDIF (NOT ${_NAME}_FIND_QUIETLY)
     ENDIF (${_NAME}_FIND_REQUIRED)
   ENDIF (${_NAME_UPPER}_FOUND)

Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindBoost.cmake	21 Jul 2006 16:04:05 -0000	1.1
+++ FindBoost.cmake	23 Jul 2007 13:49:52 -0000	1.2
@@ -65,7 +65,7 @@
 ENDIF(WIN32)
 
 
-SET(BOOST_INCLUDE_PATH_DESCRIPTION "directory containing the boost include files. E.g /usr/local/include/boost-1_33_1 or c:\\boost\\include\\boost-1_33_1")
+SET(BOOST_INCLUDE_PATH_DESCRIPTION "directory containing the boost include files, e.g. /usr/local/include/boost-1_33_1 or c:/boost/include/boost-1_33_1")
 
 SET(BOOST_DIR_MESSAGE "Set the Boost_INCLUDE_DIR cmake cache entry to the ${BOOST_INCLUDE_PATH_DESCRIPTION}")
 
@@ -103,8 +103,7 @@
   DOC "The ${BOOST_INCLUDE_PATH_DESCRIPTION}"
 )
 
-# Assume we didn't find it.
-SET(Boost_FOUND 0)
+SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
 
 # Now try to get the include and library path.
 IF(Boost_INCLUDE_DIR)
@@ -133,25 +132,17 @@
     ENDIF(EXISTS "${Boost_LIBRARY_DIR}/stage/lib")
   ENDIF(EXISTS "${Boost_LIBRARY_DIR}/lib")
 
-  IF(EXISTS "${Boost_INCLUDE_DIR}")
-    SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
-    # We have found boost. It is possible that the user has not
-    # compiled any libraries so we set Boost_FOUND to be true here.
-    SET(Boost_FOUND 1)
-  ENDIF(EXISTS "${Boost_INCLUDE_DIR}")
-
   IF(Boost_LIBRARY_DIR AND EXISTS "${Boost_LIBRARY_DIR}")
     SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIR})
   ENDIF(Boost_LIBRARY_DIR AND EXISTS "${Boost_LIBRARY_DIR}")
 ENDIF(Boost_INCLUDE_DIR)
 
-IF(NOT Boost_FOUND)
-  IF(NOT Boost_FIND_QUIETLY)
-    MESSAGE(STATUS "Boost was not found. ${BOOST_DIR_MESSAGE}")
-  ELSE(NOT Boost_FIND_QUIETLY)
-    IF(Boost_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Boost was not found. ${BOOST_DIR_MESSAGE}")
-    ENDIF(Boost_FIND_REQUIRED)
-  ENDIF(NOT Boost_FIND_QUIETLY)
-ENDIF(NOT Boost_FOUND)
+# We have found boost. It is possible that the user has not
+# compiled any libraries so we set Boost_FOUND to be true here.
+# handle the QUIETLY and REQUIRED arguments and set BOOST_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Boost "Boost was not found. ${BOOST_DIR_MESSAGE}" Boost_INCLUDE_DIR )
+SET(Boost_FOUND ${BOOST_FOUND})
 
+MARK_AS_ADVANCED(Boost_INCLUDE_DIR)

Index: FindJasper.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJasper.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FindJasper.cmake	18 Jul 2007 17:56:45 -0000	1.2
+++ FindJasper.cmake	23 Jul 2007 13:49:52 -0000	1.3
@@ -29,7 +29,7 @@
 # handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper JASPER_LIBRARY JASPER_INCLUDE_DIR JPEG_LIBRARIES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARY JASPER_INCLUDE_DIR JPEG_LIBRARIES)
 
 IF (JASPER_FOUND)
    SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} )

Index: FindBZip2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBZip2.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FindBZip2.cmake	18 Jul 2007 17:56:45 -0000	1.2
+++ FindBZip2.cmake	23 Jul 2007 13:49:52 -0000	1.3
@@ -24,7 +24,7 @@
 # handle the QUIETLY and REQUIRED arguments and set BZip2_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2 BZIP2_LIBRARIES BZIP2_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2 DEFAULT_MSG BZIP2_LIBRARIES BZIP2_INCLUDE_DIR)
 
 IF (BZIP2_FOUND)
    INCLUDE(CheckLibraryExists)

Index: FindGnuplot.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGnuplot.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FindGnuplot.cmake	19 Jul 2007 13:00:51 -0000	1.4
+++ FindGnuplot.cmake	23 Jul 2007 13:49:52 -0000	1.5
@@ -22,7 +22,7 @@
 # handle the QUIETLY and REQUIRED arguments and set GNUPLOT_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gnuplot GNUPLOT_EXECUTABLE)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gnuplot DEFAULT_MSG GNUPLOT_EXECUTABLE)
 
 MARK_AS_ADVANCED( GNUPLOT_EXECUTABLE )
 

Index: FindMotif.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMotif.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FindMotif.cmake	19 Jul 2007 13:00:51 -0000	1.4
+++ FindMotif.cmake	23 Jul 2007 13:49:52 -0000	1.5
@@ -22,7 +22,7 @@
 # handle the QUIETLY and REQUIRED arguments and set MOTIF_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Motif MOTIF_LIBRARIES MOTIF_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Motif DEFAULT_MSG MOTIF_LIBRARIES MOTIF_INCLUDE_DIR)
 
 
 MARK_AS_ADVANCED(

Index: FindPhysFS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPhysFS.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FindPhysFS.cmake	19 Jul 2007 13:00:51 -0000	1.5
+++ FindPhysFS.cmake	23 Jul 2007 13:49:52 -0000	1.6
@@ -57,4 +57,4 @@
 # handle the QUIETLY and REQUIRED arguments and set PHYSFS_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PhysFS PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PhysFS DEFAULT_MSG PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR)

Index: FindPNG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPNG.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- FindPNG.cmake	18 Jul 2007 17:56:45 -0000	1.16
+++ FindPNG.cmake	23 Jul 2007 13:49:52 -0000	1.17
@@ -39,6 +39,6 @@
 # handle the QUIETLY and REQUIRED arguments and set PNG_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PNG PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PNG DEFAULT_MSG PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
 
 MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )

Index: FindOpenAL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenAL.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FindOpenAL.cmake	18 Jul 2007 17:56:45 -0000	1.5
+++ FindOpenAL.cmake	23 Jul 2007 13:49:52 -0000	1.6
@@ -59,4 +59,4 @@
 # handle the QUIETLY and REQUIRED arguments and set OPENAL_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenAL OPENAL_LIBRARY OPENAL_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenAL DEFAULT_MSG OPENAL_LIBRARY OPENAL_INCLUDE_DIR)

Index: FindMPEG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPEG.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FindMPEG.cmake	19 Jul 2007 13:00:51 -0000	1.6
+++ FindMPEG.cmake	23 Jul 2007 13:49:52 -0000	1.7
@@ -22,7 +22,7 @@
 # handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
 
 IF(MPEG_FOUND)
   SET( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )

Index: FindJPEG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJPEG.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- FindJPEG.cmake	18 Jul 2007 17:56:45 -0000	1.13
+++ FindJPEG.cmake	23 Jul 2007 13:49:52 -0000	1.14
@@ -15,7 +15,7 @@
 # handle the QUIETLY and REQUIRED arguments and set JPEG_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(JPEG JPEG_LIBRARY JPEG_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(JPEG DEFAULT_MSG JPEG_LIBRARY JPEG_INCLUDE_DIR)
 
 IF(JPEG_FOUND)
   SET(JPEG_LIBRARIES ${JPEG_LIBRARY})

Index: FindTCL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTCL.cmake,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- FindTCL.cmake	19 Jul 2007 17:40:23 -0000	1.43
+++ FindTCL.cmake	23 Jul 2007 13:49:52 -0000	1.44
@@ -146,13 +146,13 @@
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL TCL_LIBRARY TCL_INCLUDE_PATH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL DEFAULT_MSG TCL_LIBRARY TCL_INCLUDE_PATH)
 SET(TCLTK_FIND_REQUIRED ${TCL_FIND_REQUIRED})
 SET(TCLTK_FIND_QUIETLY  ${TCL_FIND_QUIETLY})
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCLTK TCL_LIBRARY TCL_INCLUDE_PATH TK_LIBRARY TK_INCLUDE_PATH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCLTK DEFAULT_MSG TCL_LIBRARY TCL_INCLUDE_PATH TK_LIBRARY TK_INCLUDE_PATH)
 SET(TK_FIND_REQUIRED ${TCL_FIND_REQUIRED})
 SET(TK_FIND_QUIETLY  ${TCL_FIND_QUIETLY})
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(TK TK_LIBRARY TK_INCLUDE_PATH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TK DEFAULT_MSG TK_LIBRARY TK_INCLUDE_PATH)
 
 
 MARK_AS_ADVANCED(

Index: FindLibXslt.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLibXslt.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FindLibXslt.cmake	18 Jul 2007 17:56:45 -0000	1.2
+++ FindLibXslt.cmake	23 Jul 2007 13:49:52 -0000	1.3
@@ -38,7 +38,7 @@
 
 # handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if 
 # all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXslt LIBXSLT_LIBRARIES LIBXSLT_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXslt DEFAULT_MSG LIBXSLT_LIBRARIES LIBXSLT_INCLUDE_DIR)
 
 
 MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES)

More information about the Cmake-commits mailing list