[cmake-commits] barre committed FindTCL.cmake 1.45 1.46 FindTclsh.cmake 1.14 1.15 FindWish.cmake 1.8 1.9

[cmake-commits at cmake.org]

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

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


Index: FindTCL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTCL.cmake,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- FindTCL.cmake	18 Jan 2008 18:15:12 -0000	1.45
+++ FindTCL.cmake	18 Jan 2008 18:46:10 -0000	1.46
@@ -32,7 +32,10 @@
 GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
 GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
 
+GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
 GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
+
+GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
 GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
 
 GET_FILENAME_COMPONENT(
@@ -168,9 +171,6 @@
   ENDIF(NOT TK_INCLUDE_PATH)
 ENDIF(Tk_FRAMEWORKS)
 
-GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
-GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
-
 SET (TCLTK_POSSIBLE_INCLUDE_PATHS
   ${TCL_TCLSH_PATH_PARENT}/include
   ${TK_WISH_PATH_PARENT}/include

Index: FindWish.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindWish.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- FindWish.cmake	18 Jan 2008 18:15:12 -0000	1.8
+++ FindWish.cmake	18 Jan 2008 18:46:10 -0000	1.9
@@ -14,9 +14,9 @@
 GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
 
 GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
-GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
-
 GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
+
+GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
 GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
 
 GET_FILENAME_COMPONENT(

Index: FindTclsh.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTclsh.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- FindTclsh.cmake	18 Jan 2008 18:15:12 -0000	1.14
+++ FindTclsh.cmake	18 Jan 2008 18:46:10 -0000	1.15
@@ -15,9 +15,9 @@
 GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
 
 GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
-GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
-
 GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
+
+GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
 GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
 
 GET_FILENAME_COMPONENT(