summaryrefslogtreecommitdiffstats
path: root/Modules/FindWish.cmake
diff options
context:
space:
mode:
authorSebastien Barre <sebastien.barre@kitware.com>2008-01-25 00:31:24 (GMT)
committerSebastien Barre <sebastien.barre@kitware.com>2008-01-25 00:31:24 (GMT)
commitaf9987ed79a7e34173c41c439f002dd940b07861 (patch)
tree0c61a6c058c6c5477b5190959697d86fb5a209f4 /Modules/FindWish.cmake
parentf1c5b50cb7ede677ea16c64da942397c42bdc6d5 (diff)
downloadCMake-af9987ed79a7e34173c41c439f002dd940b07861.zip
CMake-af9987ed79a7e34173c41c439f002dd940b07861.tar.gz
CMake-af9987ed79a7e34173c41c439f002dd940b07861.tar.bz2
ENH: update for Tcl/Tk 8.5
Diffstat (limited to 'Modules/FindWish.cmake')
-rw-r--r--Modules/FindWish.cmake12
1 files changed, 10 insertions, 2 deletions
diff --git a/Modules/FindWish.cmake b/Modules/FindWish.cmake
index ecd793b..ce17aec 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}
)