summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlorenz <sppedflyer@gmail.com>2018-01-15 20:36:15 (GMT)
committerBrad King <brad.king@kitware.com>2018-01-16 14:52:24 (GMT)
commitc9f66540591303d8ba9bce83865059b79bdc6e01 (patch)
tree1891a9f3e5218dbb61afd9ecda54c619b65f1d1a
parent675adaa4a4c5348049324d8cabe0cdde7a3d0ef0 (diff)
downloadCMake-c9f66540591303d8ba9bce83865059b79bdc6e01.zip
CMake-c9f66540591303d8ba9bce83865059b79bdc6e01.tar.gz
CMake-c9f66540591303d8ba9bce83865059b79bdc6e01.tar.bz2
FindTCL: Find 8.6 libraries with 't' suffix
Building Tcl with `makefile.vc` produces library files with a `t` suffix to indicate threading support. Since threading support is on by default in 8.6 anyway, the libraries should be compatible. Issue: https://github.com/conda-forge/tk-feedstock/issues/12
-rw-r--r--Modules/FindTCL.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index 80779b3..19eb932 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -116,7 +116,7 @@ find_library(TCL_LIBRARY
NAMES
tcl
tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
- tcl86 tcl8.6
+ tcl86 tcl8.6 tcl86t tcl8.6t
tcl85 tcl8.5
tcl84 tcl8.4
tcl83 tcl8.3
@@ -130,7 +130,7 @@ find_library(TK_LIBRARY
NAMES
tk
tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
- tk86 tk8.6
+ tk86 tk8.6 tk86t tk8.6t
tk85 tk8.5
tk84 tk8.4
tk83 tk8.3