diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2008-01-18 13:15:12 -0500 |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2008-01-18 13:15:12 -0500 |
| commit | 4f37eacfdbcdda1f68edfa9e4428c9a040f797fb (patch) | |
| tree | b85a155e908314c11d2c479db5eecfdd5d06708e /Modules/FindTclsh.cmake | |
| parent | f74c8cf0d87337f3a2f66a2c0b8ed682ad5b9e5c (diff) | |
| download | cmake-4f37eacfdbcdda1f68edfa9e4428c9a040f797fb.tar.gz | |
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.cmake | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake index c1ab91fe83..aaed8ddf6a 100644 --- a/Modules/FindTclsh.cmake +++ b/Modules/FindTclsh.cmake @@ -11,21 +11,34 @@ IF(WIN32 AND UNIX) FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80) ENDIF(WIN32 AND UNIX) +GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH) +GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH) + GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH) GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH) +GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH) +GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH) + +GET_FILENAME_COMPONENT( + ActiveTcl_CurrentVersion + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]" + NAME) + FIND_PROGRAM(TCL_TCLSH NAMES tclsh + tclsh85 tclsh8.5 tclsh84 tclsh8.4 tclsh83 tclsh8.3 tclsh82 tclsh8.2 tclsh80 tclsh8.0 PATHS - "${TCL_INCLUDE_PATH}/../bin" - "${TK_INCLUDE_PATH}/../bin" - "${TCL_LIBRARY_PATH}/../bin" - "${TK_LIBRARY_PATH}/../bin" - [HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\8.4.6.0]/bin + "${TCL_INCLUDE_PATH_PARENT}/bin" + "${TK_INCLUDE_PATH_PARENT}/bin" + "${TCL_LIBRARY_PATH_PARENT}/bin" + "${TK_LIBRARY_PATH_PARENT}/bin" + [HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/bin + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/bin [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/bin [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/bin [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/bin |