mirror of
https://github.com/Kitware/CMake.git
synced 2026-08-09 17:18:18 +00:00
Find{TCL,Tclsh,TclStub}: Remove matches for non-existent Tcl/Tk 8.7
Version 8.7 of Tcl/Tk never made it past alpha status. What was briefly labeled 8.7a5 eventually released as 9.0.0. And in FindTclStub, also remove patterns for ttkstub8.8, which even more than 8.7 never actually existed.
This commit is contained in:
committed by
Brad King
parent
df0671701e
commit
7ab991f5b6
@@ -116,8 +116,6 @@ 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
|
||||
@@ -143,7 +141,6 @@ 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
|
||||
@@ -158,7 +155,6 @@ 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
|
||||
@@ -205,8 +201,6 @@ 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
|
||||
|
||||
@@ -119,7 +119,6 @@ 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
|
||||
@@ -133,7 +132,6 @@ 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
|
||||
@@ -147,8 +145,6 @@ find_library(TTK_STUB_LIBRARY
|
||||
NAMES
|
||||
ttkstub
|
||||
ttkstub${TCL_LIBRARY_VERSION} ttkstub${TCL_TCLSH_VERSION} ttkstub${TK_WISH_VERSION}
|
||||
ttkstub88 ttkstub8.8
|
||||
ttkstub87 ttkstub8.7
|
||||
ttkstub86 ttkstub8.6
|
||||
ttkstub85 ttkstub8.5
|
||||
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
|
||||
|
||||
@@ -114,7 +114,6 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user