From af9987ed79a7e34173c41c439f002dd940b07861 Mon Sep 17 00:00:00 2001
From: Sebastien Barre <sebastien.barre@kitware.com>
Date: Thu, 24 Jan 2008 19:31:24 -0500
Subject: ENH: update for Tcl/Tk 8.5

---
 Modules/FindWish.cmake | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'Modules/FindWish.cmake')

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}
 )
 
-- 
cgit v1.2.1