diff options
| author | Brad King <brad.king@kitware.com> | 2001-12-10 17:04:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-12-10 17:04:02 (GMT) |
| commit | 0248c986581245111d00adae411eaa58cbc44533 (patch) | |
| tree | 58544aaf1b76cf1fdd6ccf111dcc272d4d6cccda | |
| parent | e19a90ab2092c53f1c1c1bcb53bde6bc6a7d95b2 (diff) | |
| download | CMake-0248c986581245111d00adae411eaa58cbc44533.zip CMake-0248c986581245111d00adae411eaa58cbc44533.tar.gz CMake-0248c986581245111d00adae411eaa58cbc44533.tar.bz2 | |
ENH: Added more filenames for tclsh program. Also now only looks for cygtclsh80 if under cygwin.
| -rw-r--r-- | Modules/FindTclsh.cmake | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake index cfb1ab1..50a7687 100644 --- a/Modules/FindTclsh.cmake +++ b/Modules/FindTclsh.cmake @@ -7,13 +7,18 @@ # TK_WISH = the full path to the wish binary (wish wish80 etc) # -# if unix look for the cyg version first to avoid finding it -# on a windows box running only win32 builds -IF(UNIX) - FIND_PROGRAM(TCL_TCLSH cygtclsh80) -ENDIF(UNIX) +# In cygwin, look for the cygwin version first. Don't look for it later to +# avoid finding the cygwin version on a Win32 build. +IF(WIN32) + IF(UNIX) + FIND_PROGRAM(TCL_TCLSH cygtclsh80) + ENDIF(UNIX) +ENDIF(WIN32) FIND_PROGRAM(TCL_TCLSH - NAMES tclsh tclsh84 tclsh8.4 tclsh83 tclsh8.3 tclsh82 tclsh80 cygtclsh80 + NAMES tclsh + tclsh84 tclsh8.4 + tclsh83 tclsh8.3 + tclsh82 tclsh8.2 + tclsh80 tclsh8.0 ) - |