ENH: update for Tcl/Tk 8.5

4 files changed, 40 insertions, 28 deletions

diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index 583ebed5ac..2d3e23f69e 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -56,10 +56,12 @@ GET_FILENAME_COMPONENT(
   NAME)
 
 SET (TCLTK_POSSIBLE_LIB_PATHS
-  "${TCL_TCLSH_PATH_PARENT}/lib"
-  "${TK_WISH_PATH_PARENT}/lib"
   "${TCL_INCLUDE_PATH_PARENT}/lib"
   "${TK_INCLUDE_PATH_PARENT}/lib"
+  "${TCL_LIBRARY_PATH}"
+  "${TK_LIBRARY_PATH}"
+  "${TCL_TCLSH_PATH_PARENT}/lib"
+  "${TK_WISH_PATH_PARENT}/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib"
@@ -119,10 +121,12 @@ IF(Tk_FRAMEWORKS)
 ENDIF(Tk_FRAMEWORKS)
 
 SET (TCLTK_POSSIBLE_INCLUDE_PATHS
-  "${TCL_TCLSH_PATH_PARENT}/include"
-  "${TK_WISH_PATH_PARENT}/include"
   "${TCL_LIBRARY_PATH_PARENT}/include"
   "${TK_LIBRARY_PATH_PARENT}/include"
+  "${TCL_INCLUDE_PATH}"
+  "${TK_INCLUDE_PATH}"
+  "${TCL_TCLSH_PATH_PARENT}/include"
+  "${TK_WISH_PATH_PARENT}/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include"
diff --git a/Modules/FindTclStub.cmake b/Modules/FindTclStub.cmake
index 1b1361db29..9faf1fa3f1 100644
--- a/Modules/FindTclStub.cmake
+++ b/Modules/FindTclStub.cmake
@@ -43,10 +43,12 @@ GET_FILENAME_COMPONENT(
   NAME)
 
 SET (TCLTK_POSSIBLE_LIB_PATHS
-  "${TCL_TCLSH_PATH_PARENT}/lib"
-  "${TK_WISH_PATH_PARENT}/lib"
   "${TCL_INCLUDE_PATH_PARENT}/lib"
   "${TK_INCLUDE_PATH_PARENT}/lib"
+  "${TCL_LIBRARY_PATH}"
+  "${TK_LIBRARY_PATH}"
+  "${TCL_TCLSH_PATH_PARENT}/lib"
+  "${TK_WISH_PATH_PARENT}/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib"
diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake
index de6fc2352c..2f550d514a 100644
--- a/Modules/FindTclsh.cmake
+++ b/Modules/FindTclsh.cmake
@@ -28,20 +28,12 @@ GET_FILENAME_COMPONENT(
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]" 
   NAME)
 
-FIND_PROGRAM(TCL_TCLSH
-  NAMES tclsh
-  tclsh86 tclsh8.6
-  tclsh85 tclsh8.5
-  tclsh84 tclsh8.4
-  tclsh83 tclsh8.3
-  tclsh82 tclsh8.2
-  tclsh80 tclsh8.0
-  PATHS
-  "${TK_WISH_PATH_PARENT}/bin"
+SET(TCLTK_POSSIBLE_BIN_PATHS
   "${TCL_INCLUDE_PATH_PARENT}/bin"
   "${TK_INCLUDE_PATH_PARENT}/bin"
   "${TCL_LIBRARY_PATH_PARENT}/bin"
   "${TK_LIBRARY_PATH_PARENT}/bin"
+  "${TK_WISH_PATH_PARENT}/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/bin"
@@ -51,9 +43,20 @@ FIND_PROGRAM(TCL_TCLSH
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
 )
 
+FIND_PROGRAM(TCL_TCLSH
+  NAMES tclsh
+  tclsh86 tclsh8.6
+  tclsh85 tclsh8.5
+  tclsh84 tclsh8.4
+  tclsh83 tclsh8.3
+  tclsh82 tclsh8.2
+  tclsh80 tclsh8.0
+  PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
+)
+
 # 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 DEFAULT_MSG TCL_TCLSH)
 
-MARK_AS_ADVANCED( TCL_TCLSH  )
+MARK_AS_ADVANCED(TCL_TCLSH)
diff --git a/Modules/FindWish.cmake b/Modules/FindWish.cmake
index c8e67e5398..ecd793b407 100644
--- a/Modules/FindWish.cmake
+++ b/Modules/FindWish.cmake
@@ -27,20 +27,12 @@ GET_FILENAME_COMPONENT(
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]" 
   NAME)
 
-FIND_PROGRAM(TK_WISH
-  NAMES wish 
-  wish86 wish8.6
-  wish85 wish8.5 
-  wish84 wish8.4 
-  wish83 wish8.3 
-  wish82 wish8.2 
-  wish80 wish8.0
-  PATHS
-  "${TCL_TCLSH_PATH_PARENT}/bin"
+SET(TCLTK_POSSIBLE_BIN_PATHS
   "${TCL_INCLUDE_PATH_PARENT}/bin"
   "${TK_INCLUDE_PATH_PARENT}/bin"
   "${TCL_LIBRARY_PATH_PARENT}/bin"
   "${TK_LIBRARY_PATH_PARENT}/bin"
+  "${TCL_TCLSH_PATH_PARENT}/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/bin"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/bin"
@@ -50,4 +42,15 @@ FIND_PROGRAM(TK_WISH
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
 )
 
-MARK_AS_ADVANCED(TK_WISH  )
+FIND_PROGRAM(TK_WISH
+  NAMES wish 
+  wish86 wish8.6
+  wish85 wish8.5 
+  wish84 wish8.4 
+  wish83 wish8.3 
+  wish82 wish8.2 
+  wish80 wish8.0
+  PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
+)
+
+MARK_AS_ADVANCED(TK_WISH)