diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2008-01-23 16:27:36 -0500 |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2008-01-23 16:27:36 -0500 |
| commit | 99198a0765e710bafe1c3176a799c386fb4b6f5b (patch) | |
| tree | cc09f9e0f9524bd3a0d9d8ed57d01b01143243a2 /Modules/FindTCL.cmake | |
| parent | 7adb808244669555135f87a728c983d5e382454e (diff) | |
| download | cmake-99198a0765e710bafe1c3176a799c386fb4b6f5b.tar.gz | |
ENH: update for Tcl/Tk 8.5
Diffstat (limited to 'Modules/FindTCL.cmake')
| -rw-r--r-- | Modules/FindTCL.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake index 583ebed5ac..2d3e23f69e 100644 --- a/Modules/FindTCL.cmake +++ b/Modules/FindTCL.cmake @@ -56,10 +56,12 @@ GET_FILENAME_COMPONENT( NAME) SET (TCLTK_POSSIBLE_LIB_PATHS - "${TCL_TCLSH_PATH_PARENT}/lib" - "${TK_WISH_PATH_PARENT}/lib" "${TCL_INCLUDE_PATH_PARENT}/lib" "${TK_INCLUDE_PATH_PARENT}/lib" + "${TCL_LIBRARY_PATH}" + "${TK_LIBRARY_PATH}" + "${TCL_TCLSH_PATH_PARENT}/lib" + "${TK_WISH_PATH_PARENT}/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib" @@ -119,10 +121,12 @@ IF(Tk_FRAMEWORKS) ENDIF(Tk_FRAMEWORKS) SET (TCLTK_POSSIBLE_INCLUDE_PATHS - "${TCL_TCLSH_PATH_PARENT}/include" - "${TK_WISH_PATH_PARENT}/include" "${TCL_LIBRARY_PATH_PARENT}/include" "${TK_LIBRARY_PATH_PARENT}/include" + "${TCL_INCLUDE_PATH}" + "${TK_INCLUDE_PATH}" + "${TCL_TCLSH_PATH_PARENT}/include" + "${TK_WISH_PATH_PARENT}/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include" |