diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-19 11:08:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-07-19 11:09:03 (GMT) |
| commit | af041b71f7106d4bf46d820d51a51e2490661cb6 (patch) | |
| tree | adec6afd6bcfad29f8944db757e291a97f564593 /Modules | |
| parent | 018c373f35501196af8d27bdcd23488ccf8feb9d (diff) | |
| parent | bec3be11b9a5764e156deaf15c3f8cc1a2121da8 (diff) | |
| download | CMake-af041b71f7106d4bf46d820d51a51e2490661cb6.zip CMake-af041b71f7106d4bf46d820d51a51e2490661cb6.tar.gz CMake-af041b71f7106d4bf46d820d51a51e2490661cb6.tar.bz2 | |
Merge topic 'tcl-8.7'
bec3be11b9 FindTCL: Add support for version 8.7
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2223
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindTCL.cmake | 6 | ||||
| -rw-r--r-- | Modules/FindTclStub.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindTclsh.cmake | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake index 19eb932..ad16e0d 100644 --- a/Modules/FindTCL.cmake +++ b/Modules/FindTCL.cmake @@ -85,6 +85,8 @@ set(TCLTK_POSSIBLE_LIB_PATHS ) set(TCLTK_POSSIBLE_LIB_PATH_SUFFIXES + lib/tcl/tcl8.7 + lib/tcl/tk8.7 lib/tcl/tcl8.6 lib/tcl/tk8.6 lib/tcl/tcl8.5 @@ -116,6 +118,7 @@ find_library(TCL_LIBRARY NAMES tcl tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION} + tcl87 tcl8.7 tcl87t tcl8.7t tcl86 tcl8.6 tcl86t tcl8.6t tcl85 tcl8.5 tcl84 tcl8.4 @@ -130,6 +133,7 @@ find_library(TK_LIBRARY NAMES tk tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION} + tk87 tk8.7 tk87t tk8.7t tk86 tk8.6 tk86t tk8.6t tk85 tk8.5 tk84 tk8.4 @@ -176,6 +180,8 @@ set(TCLTK_POSSIBLE_INCLUDE_PATHS set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES include/tcl${TK_LIBRARY_VERSION} include/tcl${TCL_LIBRARY_VERSION} + include/tcl8.7 + include/tk8.7 include/tcl8.6 include/tk8.6 include/tcl8.5 diff --git a/Modules/FindTclStub.cmake b/Modules/FindTclStub.cmake index 51fc029..db0a7a1 100644 --- a/Modules/FindTclStub.cmake +++ b/Modules/FindTclStub.cmake @@ -101,6 +101,7 @@ find_library(TCL_STUB_LIBRARY NAMES tclstub tclstub${TK_LIBRARY_VERSION} tclstub${TCL_TCLSH_VERSION} tclstub${TK_WISH_VERSION} + tclstub87 tclstub8.7 tclstub86 tclstub8.6 tclstub85 tclstub8.5 tclstub84 tclstub8.4 @@ -114,6 +115,7 @@ find_library(TK_STUB_LIBRARY NAMES tkstub tkstub${TCL_LIBRARY_VERSION} tkstub${TCL_TCLSH_VERSION} tkstub${TK_WISH_VERSION} + tkstub87 tkstub8.7 tkstub86 tkstub8.6 tkstub85 tkstub8.5 tkstub84 tkstub8.4 diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake index 9fcb41c..9bf935d 100644 --- a/Modules/FindTclsh.cmake +++ b/Modules/FindTclsh.cmake @@ -68,6 +68,7 @@ endif() set(TCL_TCLSH_NAMES tclsh tclsh${TCL_LIBRARY_VERSION} tclsh${TK_LIBRARY_VERSION} tclsh${TK_WISH_VERSION} + tclsh87 tclsh8.7 tclsh86 tclsh8.6 tclsh85 tclsh8.5 tclsh84 tclsh8.4 |