summaryrefslogtreecommitdiffstats
path: root/Modules/FindWish.cmake
diff options
context:
space:
mode:
authorSebastien Barre <sebastien.barre@kitware.com>2008-01-23 21:27:36 (GMT)
committerSebastien Barre <sebastien.barre@kitware.com>2008-01-23 21:27:36 (GMT)
commit99198a0765e710bafe1c3176a799c386fb4b6f5b (patch)
treecc09f9e0f9524bd3a0d9d8ed57d01b01143243a2 /Modules/FindWish.cmake
parent7adb808244669555135f87a728c983d5e382454e (diff)
downloadCMake-99198a0765e710bafe1c3176a799c386fb4b6f5b.zip
CMake-99198a0765e710bafe1c3176a799c386fb4b6f5b.tar.gz
CMake-99198a0765e710bafe1c3176a799c386fb4b6f5b.tar.bz2
ENH: update for Tcl/Tk 8.5
Diffstat (limited to 'Modules/FindWish.cmake')
-rw-r--r--Modules/FindWish.cmake25
1 files changed, 14 insertions, 11 deletions
diff --git a/Modules/FindWish.cmake b/Modules/FindWish.cmake
index c8e67e5..ecd793b 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)