summaryrefslogtreecommitdiff
path: root/Modules/FindWish.cmake
diff options
context:
space:
mode:
authorSebastien Barre <sebastien.barre@kitware.com>2008-01-18 13:51:25 -0500
committerSebastien Barre <sebastien.barre@kitware.com>2008-01-18 13:51:25 -0500
commit87d9660f8dd350eb715ed7f9f628384e76dda8f7 (patch)
treeab0ac7f946391ed57f7e73f1c98eac3983bd6dea /Modules/FindWish.cmake
parent03dfe8356ff0248cbbd1b842affad7c1bc2f7488 (diff)
downloadcmake-87d9660f8dd350eb715ed7f9f628384e76dda8f7.tar.gz
ENH: cleanup FindPerl and FindTcl (use ActiveState CurrentVersion, and support Tcl/Tk 8.5)
Diffstat (limited to 'Modules/FindWish.cmake')
-rw-r--r--Modules/FindWish.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/FindWish.cmake b/Modules/FindWish.cmake
index 4e365cfb8e..9d501a014e 100644
--- a/Modules/FindWish.cmake
+++ b/Modules/FindWish.cmake
@@ -10,6 +10,9 @@ IF(UNIX)
FIND_PROGRAM(TK_WISH cygwish80 )
ENDIF(UNIX)
+GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
+GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
+
GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
@@ -32,6 +35,7 @@ FIND_PROGRAM(TK_WISH
wish82 wish8.2
wish80 wish8.0
PATHS
+ "${TCL_TCLSH_PATH_PARENT}/bin"
"${TCL_INCLUDE_PATH_PARENT}/bin"
"${TK_INCLUDE_PATH_PARENT}/bin"
"${TCL_LIBRARY_PATH_PARENT}/bin"