summaryrefslogtreecommitdiffstats
path: root/Modules/FindTclsh.cmake
diff options
context:
space:
mode:
authorSebastien Barre <sebastien.barre@kitware.com>2008-01-18 18:51:25 (GMT)
committerSebastien Barre <sebastien.barre@kitware.com>2008-01-18 18:51:25 (GMT)
commit87d9660f8dd350eb715ed7f9f628384e76dda8f7 (patch)
treeab0ac7f946391ed57f7e73f1c98eac3983bd6dea /Modules/FindTclsh.cmake
parent03dfe8356ff0248cbbd1b842affad7c1bc2f7488 (diff)
downloadCMake-87d9660f8dd350eb715ed7f9f628384e76dda8f7.zip
CMake-87d9660f8dd350eb715ed7f9f628384e76dda8f7.tar.gz
CMake-87d9660f8dd350eb715ed7f9f628384e76dda8f7.tar.bz2
ENH: cleanup FindPerl and FindTcl (use ActiveState CurrentVersion, and support Tcl/Tk 8.5)
Diffstat (limited to 'Modules/FindTclsh.cmake')
-rw-r--r--Modules/FindTclsh.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake
index 8cb3a76..eae9ddb 100644
--- a/Modules/FindTclsh.cmake
+++ b/Modules/FindTclsh.cmake
@@ -11,6 +11,9 @@ IF(WIN32 AND UNIX)
FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80)
ENDIF(WIN32 AND UNIX)
+GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
+GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH)
+
GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
@@ -33,6 +36,7 @@ FIND_PROGRAM(TCL_TCLSH
tclsh82 tclsh8.2
tclsh80 tclsh8.0
PATHS
+ "${TK_WISH_PATH_PARENT}/bin"
"${TCL_INCLUDE_PATH_PARENT}/bin"
"${TK_INCLUDE_PATH_PARENT}/bin"
"${TCL_LIBRARY_PATH_PARENT}/bin"