[cmake-commits] alex committed FindTCL.cmake 1.42 1.43

[cmake-commits at cmake.org]

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

Modified Files:
	FindTCL.cmake 
Log Message:

ENH: add TK_FOUND and TCLTK_FOUND
TCL_FOUND is now TRUE if Tcl was found, before it was only TRUE if Tcl and
Tk were found

Alex


Index: FindTCL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTCL.cmake,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- FindTCL.cmake	19 Jul 2007 13:00:51 -0000	1.42
+++ FindTCL.cmake	19 Jul 2007 17:40:23 -0000	1.43
@@ -2,6 +2,9 @@
 # This module finds if TCL is installed and determines where the
 # include files and libraries are. It also determines what the name of
 # the library is. This code sets the following variables:
+#  TCL_FOUND          = Tcl was found
+#  TK_FOUND           = Tk was found
+#  TCLTK_FOUND        = Tcl and Tk were found
 #  TCL_LIBRARY        = path to Tcl library (tcl tcl80)
 #  TCL_LIBRARY_DEBUG  = path to Tcl library (debug)
 #  TCL_STUB_LIBRARY   = path to Tcl stub library
@@ -139,6 +142,19 @@
   MARK_AS_ADVANCED(TK_INTERNAL_PATH)
 ENDIF(WIN32)
 
+# 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(TCL 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)
+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)
+
+
 MARK_AS_ADVANCED(
   TCL_TCLSH_PATH
   TK_WISH_PATH
@@ -154,13 +170,4 @@
   TK_STUB_LIBRARY
   TK_STUB_LIBRARY_DEBUG
   )
- 
-IF(TCL_INCLUDE_PATH)
-  IF(TK_INCLUDE_PATH)
-    IF(TCL_LIBRARY)
-      IF(TK_LIBRARY)
-        SET(TCL_FOUND 1)
-      ENDIF(TK_LIBRARY)
-    ENDIF(TCL_LIBRARY)
-  ENDIF(TK_INCLUDE_PATH)
-ENDIF(TCL_INCLUDE_PATH)
+