ENH: update for Tcl/Tk 8.5
This commit is contained in:
Sebastien Barre
parent
386a6ebf25
commit
bd28610ec3
@ -6,25 +6,32 @@
|
||||
|
||||
INCLUDE(FindCygwin)
|
||||
|
||||
GET_FILENAME_COMPONENT(
|
||||
ActivePerl_CurrentVersion
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl;CurrentVersion]"
|
||||
NAME)
|
||||
|
||||
FIND_PROGRAM(PERL_EXECUTABLE
|
||||
perl
|
||||
"C:/Perl/bin"
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl\\${ActivePerl_CurrentVersion}]/bin
|
||||
SET(PERL_POSSIBLE_BIN_PATHS
|
||||
${CYGWIN_INSTALL_PATH}/bin
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
GET_FILENAME_COMPONENT(
|
||||
ActivePerl_CurrentVersion
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl;CurrentVersion]"
|
||||
NAME)
|
||||
SET(PERL_POSSIBLE_BIN_PATHS ${PERL_POSSIBLE_BIN_PATHS}
|
||||
"C:/Perl/bin"
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl\\${ActivePerl_CurrentVersion}]/bin
|
||||
)
|
||||
ENDIF(WIN32)
|
||||
|
||||
FIND_PROGRAM(PERL_EXECUTABLE
|
||||
NAMES perl
|
||||
PATHS ${PERL_POSSIBLE_BIN_PATHS}
|
||||
)
|
||||
|
||||
# Deprecated settings for compatibility with CMake1.4
|
||||
SET (PERL ${PERL_EXECUTABLE})
|
||||
SET(PERL ${PERL_EXECUTABLE})
|
||||
|
||||
# handle the QUIETLY and REQUIRED arguments and set PERL_FOUND to TRUE if
|
||||
# all listed variables are TRUE
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Perl DEFAULT_MSG PERL_EXECUTABLE)
|
||||
|
||||
MARK_AS_ADVANCED( PERL_EXECUTABLE )
|
||||
MARK_AS_ADVANCED(PERL_EXECUTABLE)
|
||||
|
||||
@ -50,18 +50,23 @@ GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
|
||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
|
||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
|
||||
|
||||
GET_FILENAME_COMPONENT(
|
||||
ActiveTcl_CurrentVersion
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
||||
NAME)
|
||||
|
||||
SET (TCLTK_POSSIBLE_LIB_PATHS
|
||||
SET(TCLTK_POSSIBLE_LIB_PATHS
|
||||
"${TCL_INCLUDE_PATH_PARENT}/lib"
|
||||
"${TK_INCLUDE_PATH_PARENT}/lib"
|
||||
"${TCL_LIBRARY_PATH}"
|
||||
"${TK_LIBRARY_PATH}"
|
||||
"${TCL_TCLSH_PATH_PARENT}/lib"
|
||||
"${TK_WISH_PATH_PARENT}/lib"
|
||||
/usr/lib
|
||||
/usr/local/lib
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
GET_FILENAME_COMPONENT(
|
||||
ActiveTcl_CurrentVersion
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
||||
NAME)
|
||||
SET(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib"
|
||||
@ -72,9 +77,8 @@ SET (TCLTK_POSSIBLE_LIB_PATHS
|
||||
"$ENV{ProgramFiles}/Tcl/Lib"
|
||||
"C:/Program Files/Tcl/lib"
|
||||
"C:/Tcl/lib"
|
||||
/usr/lib
|
||||
/usr/local/lib
|
||||
)
|
||||
)
|
||||
ENDIF(WIN32)
|
||||
|
||||
FIND_LIBRARY(TCL_LIBRARY
|
||||
NAMES tcl
|
||||
@ -85,7 +89,7 @@ FIND_LIBRARY(TCL_LIBRARY
|
||||
tcl82 tcl8.2
|
||||
tcl80 tcl8.0
|
||||
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
|
||||
)
|
||||
)
|
||||
|
||||
FIND_LIBRARY(TK_LIBRARY
|
||||
NAMES tk
|
||||
@ -96,7 +100,7 @@ FIND_LIBRARY(TK_LIBRARY
|
||||
tk82 tk8.2
|
||||
tk80 tk8.0
|
||||
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
|
||||
)
|
||||
)
|
||||
|
||||
CMAKE_FIND_FRAMEWORKS(Tcl)
|
||||
CMAKE_FIND_FRAMEWORKS(Tk)
|
||||
@ -120,7 +124,7 @@ IF(Tk_FRAMEWORKS)
|
||||
ENDIF(NOT TK_INCLUDE_PATH)
|
||||
ENDIF(Tk_FRAMEWORKS)
|
||||
|
||||
SET (TCLTK_POSSIBLE_INCLUDE_PATHS
|
||||
SET(TCLTK_POSSIBLE_INCLUDE_PATHS
|
||||
"${TCL_LIBRARY_PATH_PARENT}/include"
|
||||
"${TK_LIBRARY_PATH_PARENT}/include"
|
||||
"${TCL_INCLUDE_PATH}"
|
||||
@ -129,6 +133,18 @@ SET (TCLTK_POSSIBLE_INCLUDE_PATHS
|
||||
${TK_FRAMEWORK_INCLUDES}
|
||||
"${TCL_TCLSH_PATH_PARENT}/include"
|
||||
"${TK_WISH_PATH_PARENT}/include"
|
||||
/usr/include
|
||||
/usr/local/include
|
||||
/usr/include/tcl8.6
|
||||
/usr/include/tcl8.5
|
||||
/usr/include/tcl8.4
|
||||
/usr/include/tcl8.3
|
||||
/usr/include/tcl8.2
|
||||
/usr/include/tcl8.0
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
SET(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include"
|
||||
@ -139,29 +155,28 @@ SET (TCLTK_POSSIBLE_INCLUDE_PATHS
|
||||
"$ENV{ProgramFiles}/Tcl/include"
|
||||
"C:/Program Files/Tcl/include"
|
||||
"C:/Tcl/include"
|
||||
/usr/include
|
||||
/usr/local/include
|
||||
/usr/include/tcl8.6
|
||||
/usr/include/tcl8.5
|
||||
/usr/include/tcl8.4
|
||||
/usr/include/tcl8.3
|
||||
/usr/include/tcl8.2
|
||||
/usr/include/tcl8.0
|
||||
)
|
||||
)
|
||||
ENDIF(WIN32)
|
||||
|
||||
FIND_PATH(TCL_INCLUDE_PATH tcl.h
|
||||
${TCLTK_POSSIBLE_INCLUDE_PATHS} NO_DEFAULT_PATH
|
||||
)
|
||||
FIND_PATH(TCL_INCLUDE_PATH tcl.h
|
||||
${TCLTK_POSSIBLE_INCLUDE_PATHS}
|
||||
)
|
||||
FIND_PATH(TCL_INCLUDE_PATH
|
||||
NAMES tcl.h
|
||||
PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
FIND_PATH(TCL_INCLUDE_PATH
|
||||
NAMES tcl.h
|
||||
PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
|
||||
)
|
||||
|
||||
FIND_PATH(TK_INCLUDE_PATH tk.h
|
||||
${TCLTK_POSSIBLE_INCLUDE_PATHS} NO_DEFAULT_PATH
|
||||
)
|
||||
FIND_PATH(TK_INCLUDE_PATH tk.h
|
||||
${TCLTK_POSSIBLE_INCLUDE_PATHS}
|
||||
)
|
||||
FIND_PATH(TK_INCLUDE_PATH
|
||||
NAMES tk.h
|
||||
PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
FIND_PATH(TK_INCLUDE_PATH
|
||||
NAMES tk.h
|
||||
PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
|
||||
)
|
||||
|
||||
# handle the QUIETLY and REQUIRED arguments and set TCL_FOUND to TRUE if
|
||||
# all listed variables are TRUE
|
||||
|
||||
@ -37,18 +37,23 @@ GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
|
||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
|
||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
|
||||
|
||||
GET_FILENAME_COMPONENT(
|
||||
ActiveTcl_CurrentVersion
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
||||
NAME)
|
||||
|
||||
SET (TCLTK_POSSIBLE_LIB_PATHS
|
||||
SET(TCLTK_POSSIBLE_LIB_PATHS
|
||||
"${TCL_INCLUDE_PATH_PARENT}/lib"
|
||||
"${TK_INCLUDE_PATH_PARENT}/lib"
|
||||
"${TCL_LIBRARY_PATH}"
|
||||
"${TK_LIBRARY_PATH}"
|
||||
"${TCL_TCLSH_PATH_PARENT}/lib"
|
||||
"${TK_WISH_PATH_PARENT}/lib"
|
||||
/usr/lib
|
||||
/usr/local/lib
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
GET_FILENAME_COMPONENT(
|
||||
ActiveTcl_CurrentVersion
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
||||
NAME)
|
||||
SET(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib"
|
||||
@ -59,9 +64,8 @@ SET (TCLTK_POSSIBLE_LIB_PATHS
|
||||
"$ENV{ProgramFiles}/Tcl/Lib"
|
||||
"C:/Program Files/Tcl/lib"
|
||||
"C:/Tcl/lib"
|
||||
/usr/lib
|
||||
/usr/local/lib
|
||||
)
|
||||
)
|
||||
ENDIF(WIN32)
|
||||
|
||||
FIND_LIBRARY(TCL_STUB_LIBRARY
|
||||
NAMES tclstub
|
||||
|
||||
@ -23,17 +23,20 @@ GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
|
||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
|
||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
|
||||
|
||||
GET_FILENAME_COMPONENT(
|
||||
ActiveTcl_CurrentVersion
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
||||
NAME)
|
||||
|
||||
SET(TCLTK_POSSIBLE_BIN_PATHS
|
||||
"${TCL_INCLUDE_PATH_PARENT}/bin"
|
||||
"${TK_INCLUDE_PATH_PARENT}/bin"
|
||||
"${TCL_LIBRARY_PATH_PARENT}/bin"
|
||||
"${TK_LIBRARY_PATH_PARENT}/bin"
|
||||
"${TK_WISH_PATH_PARENT}/bin"
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
GET_FILENAME_COMPONENT(
|
||||
ActiveTcl_CurrentVersion
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
||||
NAME)
|
||||
SET(TCLTK_POSSIBLE_BIN_PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/bin"
|
||||
@ -41,7 +44,8 @@ SET(TCLTK_POSSIBLE_BIN_PATHS
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
|
||||
)
|
||||
)
|
||||
ENDIF(WIN32)
|
||||
|
||||
SET(TCL_TCLSH_NAMES
|
||||
tclsh
|
||||
@ -51,16 +55,16 @@ SET(TCL_TCLSH_NAMES
|
||||
tclsh83 tclsh8.3
|
||||
tclsh82 tclsh8.2
|
||||
tclsh80 tclsh8.0
|
||||
)
|
||||
)
|
||||
|
||||
FIND_PROGRAM(TCL_TCLSH
|
||||
NAMES ${TCL_TCLSH_NAMES}
|
||||
PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
|
||||
)
|
||||
)
|
||||
FIND_PROGRAM(TCL_TCLSH
|
||||
NAMES ${TCL_TCLSH_NAMES}
|
||||
PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
|
||||
)
|
||||
)
|
||||
|
||||
# handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if
|
||||
# all listed variables are TRUE
|
||||
|
||||
@ -22,17 +22,20 @@ GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
|
||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
|
||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
|
||||
|
||||
GET_FILENAME_COMPONENT(
|
||||
ActiveTcl_CurrentVersion
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
||||
NAME)
|
||||
|
||||
SET(TCLTK_POSSIBLE_BIN_PATHS
|
||||
"${TCL_INCLUDE_PATH_PARENT}/bin"
|
||||
"${TK_INCLUDE_PATH_PARENT}/bin"
|
||||
"${TCL_LIBRARY_PATH_PARENT}/bin"
|
||||
"${TK_LIBRARY_PATH_PARENT}/bin"
|
||||
"${TCL_TCLSH_PATH_PARENT}/bin"
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
GET_FILENAME_COMPONENT(
|
||||
ActiveTcl_CurrentVersion
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
||||
NAME)
|
||||
SET(TCLTK_POSSIBLE_BIN_PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/bin"
|
||||
@ -40,7 +43,8 @@ SET(TCLTK_POSSIBLE_BIN_PATHS
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
|
||||
)
|
||||
)
|
||||
ENDIF(WIN32)
|
||||
|
||||
SET(TK_WISH_NAMES
|
||||
wish
|
||||
@ -50,15 +54,15 @@ SET(TK_WISH_NAMES
|
||||
wish83 wish8.3
|
||||
wish82 wish8.2
|
||||
wish80 wish8.0
|
||||
)
|
||||
)
|
||||
|
||||
FIND_PROGRAM(TK_WISH
|
||||
NAMES ${TK_WISH_NAMES}
|
||||
PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
|
||||
)
|
||||
)
|
||||
FIND_PROGRAM(TK_WISH
|
||||
NAMES ${TK_WISH_NAMES}
|
||||
PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
|
||||
)
|
||||
)
|
||||
|
||||
MARK_AS_ADVANCED(TK_WISH)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user