ENH: update for Tcl/Tk 8.5

Modules/FindTCL.cmake

@@ -125,6 +125,8 @@ SET (TCLTK_POSSIBLE_INCLUDE_PATHS
   "${TK_LIBRARY_PATH_PARENT}/include"
   "${TCL_INCLUDE_PATH}"
   "${TK_INCLUDE_PATH}"
+  ${TCL_FRAMEWORK_INCLUDES} 
+  ${TK_FRAMEWORK_INCLUDES} 
   "${TCL_TCLSH_PATH_PARENT}/include"
   "${TK_WISH_PATH_PARENT}/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
@@ -148,11 +150,17 @@ SET (TCLTK_POSSIBLE_INCLUDE_PATHS
 )
 
 FIND_PATH(TCL_INCLUDE_PATH tcl.h
-  ${TCL_FRAMEWORK_INCLUDES} ${TCLTK_POSSIBLE_INCLUDE_PATHS}
+  ${TCLTK_POSSIBLE_INCLUDE_PATHS} NO_DEFAULT_PATH
+)
+FIND_PATH(TCL_INCLUDE_PATH tcl.h
+  ${TCLTK_POSSIBLE_INCLUDE_PATHS}
 )
 
 FIND_PATH(TK_INCLUDE_PATH tk.h
-  ${TK_FRAMEWORK_INCLUDES} ${TCLTK_POSSIBLE_INCLUDE_PATHS}
+  ${TCLTK_POSSIBLE_INCLUDE_PATHS} NO_DEFAULT_PATH
+)
+FIND_PATH(TK_INCLUDE_PATH tk.h
+  ${TCLTK_POSSIBLE_INCLUDE_PATHS}
 )
 
 # handle the QUIETLY and REQUIRED arguments and set TCL_FOUND to TRUE if 

Modules/FindTclsh.cmake

@@ -43,14 +43,22 @@ SET(TCLTK_POSSIBLE_BIN_PATHS
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
 )
 
-FIND_PROGRAM(TCL_TCLSH
-  NAMES tclsh
+SET(TCL_TCLSH_NAMES
+  tclsh
   tclsh86 tclsh8.6
   tclsh85 tclsh8.5
   tclsh84 tclsh8.4
   tclsh83 tclsh8.3
   tclsh82 tclsh8.2
   tclsh80 tclsh8.0
+)
+
+FIND_PROGRAM(TCL_TCLSH
+  NAMES ${TCL_TCLSH_NAMES}
+  PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
+)
+FIND_PROGRAM(TCL_TCLSH
+  NAMES ${TCL_TCLSH_NAME}
   PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
 )
 

Modules/FindWish.cmake

@@ -42,14 +42,22 @@ SET(TCLTK_POSSIBLE_BIN_PATHS
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
 )
 
-FIND_PROGRAM(TK_WISH
-  NAMES wish 
+SET(TK_WISH_NAMES
+  wish 
   wish86 wish8.6
   wish85 wish8.5 
   wish84 wish8.4 
   wish83 wish8.3 
   wish82 wish8.2 
   wish80 wish8.0
+)
+
+FIND_PROGRAM(TK_WISH
+  NAMES ${TK_WISH_NAMES}
+  PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
+)
+FIND_PROGRAM(TK_WISH
+  NAMES ${TK_WISH_NAMES}
   PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
 )