[cmake-commits] barre committed FindTclsh.cmake 1.15 1.16 FindWish.cmake 1.9 1.10

[cmake-commits at cmake.org]

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

Modified Files:
	FindTclsh.cmake FindWish.cmake 
Log Message:
ENH: cleanup FindPerl and FindTcl (use ActiveState CurrentVersion, and support Tcl/Tk 8.5)


Index: FindWish.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindWish.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FindWish.cmake	18 Jan 2008 18:46:10 -0000	1.9
+++ FindWish.cmake	18 Jan 2008 18:51:25 -0000	1.10
@@ -10,6 +10,9 @@
   FIND_PROGRAM(TK_WISH cygwish80 )
 ENDIF(UNIX)
 
+GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
+GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
+
 GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
 GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
 
@@ -32,6 +35,7 @@
   wish82 wish8.2 
   wish80 wish8.0
   PATHS
+  "${TCL_TCLSH_PATH_PARENT}/bin"
   "${TCL_INCLUDE_PATH_PARENT}/bin"
   "${TK_INCLUDE_PATH_PARENT}/bin"
   "${TCL_LIBRARY_PATH_PARENT}/bin"

Index: FindTclsh.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTclsh.cmake,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- FindTclsh.cmake	18 Jan 2008 18:46:10 -0000	1.15
+++ FindTclsh.cmake	18 Jan 2008 18:51:25 -0000	1.16
@@ -11,6 +11,9 @@
   FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80)
 ENDIF(WIN32 AND UNIX)
 
+GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
+GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH)
+
 GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
 GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
 
@@ -33,6 +36,7 @@
   tclsh82 tclsh8.2
   tclsh80 tclsh8.0
   PATHS
+  "${TK_WISH_PATH_PARENT}/bin"
   "${TCL_INCLUDE_PATH_PARENT}/bin"
   "${TK_INCLUDE_PATH_PARENT}/bin"
   "${TCL_LIBRARY_PATH_PARENT}/bin"