kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: cleanup FindPerl and FindTcl (use ActiveState CurrentVersion, and support Tcl/Tk 8.5)

Browse Source
This commit is contained in:
Sebastien Barre 2008-01-18 13:51:25 -05:00
parent 03dfe8356f
commit 87d9660f8d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindTclsh.cmake
View File

@ -11,6 +11,9 @@ IF(WIN32 AND UNIX)
FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80) FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80)
ENDIF(WIN32 AND UNIX) 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(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_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 tclsh82 tclsh8.2
tclsh80 tclsh8.0 tclsh80 tclsh8.0
PATHS PATHS
"${TK_WISH_PATH_PARENT}/bin"
"${TCL_INCLUDE_PATH_PARENT}/bin" "${TCL_INCLUDE_PATH_PARENT}/bin"
"${TK_INCLUDE_PATH_PARENT}/bin" "${TK_INCLUDE_PATH_PARENT}/bin"
"${TCL_LIBRARY_PATH_PARENT}/bin" "${TCL_LIBRARY_PATH_PARENT}/bin"

4
Modules/FindWish.cmake
View File

@ -10,6 +10,9 @@ IF(UNIX)
FIND_PROGRAM(TK_WISH cygwish80 ) FIND_PROGRAM(TK_WISH cygwish80 )
ENDIF(UNIX) 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(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_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 wish82 wish8.2
wish80 wish8.0 wish80 wish8.0
PATHS PATHS
"${TCL_TCLSH_PATH_PARENT}/bin"
"${TCL_INCLUDE_PATH_PARENT}/bin" "${TCL_INCLUDE_PATH_PARENT}/bin"
"${TK_INCLUDE_PATH_PARENT}/bin" "${TK_INCLUDE_PATH_PARENT}/bin"
"${TCL_LIBRARY_PATH_PARENT}/bin" "${TCL_LIBRARY_PATH_PARENT}/bin"