diff options
| -rw-r--r-- | Modules/FindTCL.cmake | 12 | ||||
| -rw-r--r-- | Modules/FindTclsh.cmake | 12 | ||||
| -rw-r--r-- | Modules/FindWish.cmake | 12 |
3 files changed, 30 insertions, 6 deletions
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake index 2d3e23f69e..8a6a1ee7e2 100644 --- a/Modules/FindTCL.cmake +++ b/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 diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake index 2f550d514a..709b88694e 100644 --- a/Modules/FindTclsh.cmake +++ b/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} ) diff --git a/Modules/FindWish.cmake b/Modules/FindWish.cmake index ecd793b407..ce17aecb93 100644 --- a/Modules/FindWish.cmake +++ b/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} ) |