Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bill Hoffman
CMake
Commits
bec3be11
Commit
bec3be11
authored
Jul 18, 2018
by
Dima Panov
Committed by
Brad King
Jul 18, 2018
Browse files
FindTCL: Add support for version 8.7
Fixes:
#18186
parent
f84c15ef
Changes
3
Hide whitespace changes
Inline
Side-by-side
Modules/FindTCL.cmake
View file @
bec3be11
...
...
@@ -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
...
...
Modules/FindTclStub.cmake
View file @
bec3be11
...
...
@@ -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
...
...
Modules/FindTclsh.cmake
View file @
bec3be11
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment