diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2001-05-11 21:11:25 (GMT) |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2001-05-11 21:11:25 (GMT) |
| commit | 05c0cf702428e7b1c5b3131fde0e7d3572a3e879 (patch) | |
| tree | be7765ef21c2040fbe5f7de15c291c979c2dadc5 | |
| parent | fc70deedcfadf88018b0a3d5a36590fbc17f2e84 (diff) | |
| download | CMake-05c0cf702428e7b1c5b3131fde0e7d3572a3e879.zip CMake-05c0cf702428e7b1c5b3131fde0e7d3572a3e879.tar.gz CMake-05c0cf702428e7b1c5b3131fde0e7d3572a3e879.tar.bz2 | |
Add 8.4 and registry support
| -rw-r--r-- | Modules/FindTCL.cmake | 47 |
1 files changed, 39 insertions, 8 deletions
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake index c9aa65c..85f4af5 100644 --- a/Modules/FindTCL.cmake +++ b/Modules/FindTCL.cmake @@ -9,15 +9,46 @@ # TK_INCLUDE_PATH = the path to where tk.h can be found # -# try to find the Tcl libraries in a few places and names FIND_LIBRARY(TCL_LIBRARY - NAMES tcl tcl83 tcl82 tcl80 - PATHS /usr/lib "C:/Program Files/Tcl/lib" /usr/local/lib) + NAMES tcl tcl84 tcl83 tcl82 tcl80 + PATHS + /usr/lib + /usr/local/lib + "C:/Program Files/Tcl/lib" + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.4§Root]/lib + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.3§Root]/lib + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2§Root]/lib + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.0§Root]/lib +) FIND_LIBRARY(TK_LIBRARY - NAMES tk tk83 tk82 tk80 - PATHS /usr/lib "C:/Program Files/Tcl/lib" /usr/local/lib) + NAMES tk tk84 tk83 tk82 tk80 + PATHS + /usr/lib + /usr/local/lib + "C:/Program Files/Tcl/lib" + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.4§Root]/lib + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.3§Root]/lib + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2§Root]/lib + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.0§Root]/lib +) -# add in the include path -FIND_PATH(TCL_INCLUDE_PATH tcl.h "C:/Program Files/Tcl/include" /usr/include /usr/local/include) -FIND_PATH(TK_INCLUDE_PATH tk.h "C:/Program Files/Tcl/include" /usr/include /usr/local/include) +FIND_PATH(TCL_INCLUDE_PATH tcl.h + /usr/include + /usr/local/include + "C:/Program Files/Tcl/include" + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.4§Root]/include + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.3§Root]/include + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2§Root]/include + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.0§Root]/include +) + +FIND_PATH(TK_INCLUDE_PATH tk.h + /usr/include + /usr/local/include + "C:/Program Files/Tcl/include" + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.4§Root]/include + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.3§Root]/include + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2§Root]/include + [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.0§Root]/include +) |