diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2004-01-09 15:57:17 -0500 |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2004-01-09 15:57:17 -0500 |
| commit | 1b2e663dfb940a28eecde01784913c9006d0e2b3 (patch) | |
| tree | 98cf6f7c2d4edaaa4aa79bc278eb059805971bbe /Modules/FindTclsh.cmake | |
| parent | 00332a958eed520c050ca6bf568f6e2491d8d2de (diff) | |
| download | cmake-1b2e663dfb940a28eecde01784913c9006d0e2b3.tar.gz | |
ENH: make it a bit smarter at finding stuff: now you need only to set *ONE* of (TCL|TK)_INCLUDE_PATH, (TCL|TK)_LIBRARY, TCL_TCLSH and the rest will be found.
Diffstat (limited to 'Modules/FindTclsh.cmake')
| -rw-r--r-- | Modules/FindTclsh.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake index 5a7e68ab1f..362a078fdb 100644 --- a/Modules/FindTclsh.cmake +++ b/Modules/FindTclsh.cmake @@ -14,6 +14,9 @@ IF(WIN32) ENDIF(UNIX) ENDIF(WIN32) +GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH) +GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH) + FIND_PROGRAM(TCL_TCLSH NAMES tclsh tclsh84 tclsh8.4 @@ -21,6 +24,10 @@ FIND_PROGRAM(TCL_TCLSH 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\\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 |