ENH: update for Tcl/Tk 8.5
This commit is contained in:
parent
386a6ebf25
commit
bd28610ec3
@ -6,25 +6,32 @@
|
|||||||
|
|
||||||
INCLUDE(FindCygwin)
|
INCLUDE(FindCygwin)
|
||||||
|
|
||||||
GET_FILENAME_COMPONENT(
|
SET(PERL_POSSIBLE_BIN_PATHS
|
||||||
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
|
|
||||||
${CYGWIN_INSTALL_PATH}/bin
|
${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
|
# 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
|
# handle the QUIETLY and REQUIRED arguments and set PERL_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Perl DEFAULT_MSG PERL_EXECUTABLE)
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Perl DEFAULT_MSG PERL_EXECUTABLE)
|
||||||
|
|
||||||
MARK_AS_ADVANCED( PERL_EXECUTABLE )
|
MARK_AS_ADVANCED(PERL_EXECUTABLE)
|
||||||
|
@ -50,31 +50,35 @@ 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 "${TK_LIBRARY}" PATH)
|
||||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
|
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
|
||||||
|
|
||||||
GET_FILENAME_COMPONENT(
|
SET(TCLTK_POSSIBLE_LIB_PATHS
|
||||||
ActiveTcl_CurrentVersion
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
|
||||||
NAME)
|
|
||||||
|
|
||||||
SET (TCLTK_POSSIBLE_LIB_PATHS
|
|
||||||
"${TCL_INCLUDE_PATH_PARENT}/lib"
|
"${TCL_INCLUDE_PATH_PARENT}/lib"
|
||||||
"${TK_INCLUDE_PATH_PARENT}/lib"
|
"${TK_INCLUDE_PATH_PARENT}/lib"
|
||||||
"${TCL_LIBRARY_PATH}"
|
"${TCL_LIBRARY_PATH}"
|
||||||
"${TK_LIBRARY_PATH}"
|
"${TK_LIBRARY_PATH}"
|
||||||
"${TCL_TCLSH_PATH_PARENT}/lib"
|
"${TCL_TCLSH_PATH_PARENT}/lib"
|
||||||
"${TK_WISH_PATH_PARENT}/lib"
|
"${TK_WISH_PATH_PARENT}/lib"
|
||||||
"[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"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/lib"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib"
|
|
||||||
"$ENV{ProgramFiles}/Tcl/Lib"
|
|
||||||
"C:/Program Files/Tcl/lib"
|
|
||||||
"C:/Tcl/lib"
|
|
||||||
/usr/lib
|
/usr/lib
|
||||||
/usr/local/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"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/lib"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib"
|
||||||
|
"$ENV{ProgramFiles}/Tcl/Lib"
|
||||||
|
"C:/Program Files/Tcl/lib"
|
||||||
|
"C:/Tcl/lib"
|
||||||
|
)
|
||||||
|
ENDIF(WIN32)
|
||||||
|
|
||||||
FIND_LIBRARY(TCL_LIBRARY
|
FIND_LIBRARY(TCL_LIBRARY
|
||||||
NAMES tcl
|
NAMES tcl
|
||||||
@ -85,7 +89,7 @@ FIND_LIBRARY(TCL_LIBRARY
|
|||||||
tcl82 tcl8.2
|
tcl82 tcl8.2
|
||||||
tcl80 tcl8.0
|
tcl80 tcl8.0
|
||||||
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
|
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_LIBRARY(TK_LIBRARY
|
FIND_LIBRARY(TK_LIBRARY
|
||||||
NAMES tk
|
NAMES tk
|
||||||
@ -96,7 +100,7 @@ FIND_LIBRARY(TK_LIBRARY
|
|||||||
tk82 tk8.2
|
tk82 tk8.2
|
||||||
tk80 tk8.0
|
tk80 tk8.0
|
||||||
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
|
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
|
||||||
)
|
)
|
||||||
|
|
||||||
CMAKE_FIND_FRAMEWORKS(Tcl)
|
CMAKE_FIND_FRAMEWORKS(Tcl)
|
||||||
CMAKE_FIND_FRAMEWORKS(Tk)
|
CMAKE_FIND_FRAMEWORKS(Tk)
|
||||||
@ -120,7 +124,7 @@ IF(Tk_FRAMEWORKS)
|
|||||||
ENDIF(NOT TK_INCLUDE_PATH)
|
ENDIF(NOT TK_INCLUDE_PATH)
|
||||||
ENDIF(Tk_FRAMEWORKS)
|
ENDIF(Tk_FRAMEWORKS)
|
||||||
|
|
||||||
SET (TCLTK_POSSIBLE_INCLUDE_PATHS
|
SET(TCLTK_POSSIBLE_INCLUDE_PATHS
|
||||||
"${TCL_LIBRARY_PATH_PARENT}/include"
|
"${TCL_LIBRARY_PATH_PARENT}/include"
|
||||||
"${TK_LIBRARY_PATH_PARENT}/include"
|
"${TK_LIBRARY_PATH_PARENT}/include"
|
||||||
"${TCL_INCLUDE_PATH}"
|
"${TCL_INCLUDE_PATH}"
|
||||||
@ -129,16 +133,6 @@ SET (TCLTK_POSSIBLE_INCLUDE_PATHS
|
|||||||
${TK_FRAMEWORK_INCLUDES}
|
${TK_FRAMEWORK_INCLUDES}
|
||||||
"${TCL_TCLSH_PATH_PARENT}/include"
|
"${TCL_TCLSH_PATH_PARENT}/include"
|
||||||
"${TK_WISH_PATH_PARENT}/include"
|
"${TK_WISH_PATH_PARENT}/include"
|
||||||
"[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"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/include"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/include"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/include"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/include"
|
|
||||||
"$ENV{ProgramFiles}/Tcl/include"
|
|
||||||
"C:/Program Files/Tcl/include"
|
|
||||||
"C:/Tcl/include"
|
|
||||||
/usr/include
|
/usr/include
|
||||||
/usr/local/include
|
/usr/local/include
|
||||||
/usr/include/tcl8.6
|
/usr/include/tcl8.6
|
||||||
@ -147,21 +141,42 @@ SET (TCLTK_POSSIBLE_INCLUDE_PATHS
|
|||||||
/usr/include/tcl8.3
|
/usr/include/tcl8.3
|
||||||
/usr/include/tcl8.2
|
/usr/include/tcl8.2
|
||||||
/usr/include/tcl8.0
|
/usr/include/tcl8.0
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_PATH(TCL_INCLUDE_PATH tcl.h
|
IF(WIN32)
|
||||||
${TCLTK_POSSIBLE_INCLUDE_PATHS} NO_DEFAULT_PATH
|
SET(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
|
||||||
)
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
|
||||||
FIND_PATH(TCL_INCLUDE_PATH tcl.h
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include"
|
||||||
${TCLTK_POSSIBLE_INCLUDE_PATHS}
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include"
|
||||||
)
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/include"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/include"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/include"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/include"
|
||||||
|
"$ENV{ProgramFiles}/Tcl/include"
|
||||||
|
"C:/Program Files/Tcl/include"
|
||||||
|
"C:/Tcl/include"
|
||||||
|
)
|
||||||
|
ENDIF(WIN32)
|
||||||
|
|
||||||
FIND_PATH(TK_INCLUDE_PATH tk.h
|
FIND_PATH(TCL_INCLUDE_PATH
|
||||||
${TCLTK_POSSIBLE_INCLUDE_PATHS} NO_DEFAULT_PATH
|
NAMES tcl.h
|
||||||
)
|
PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
|
||||||
FIND_PATH(TK_INCLUDE_PATH tk.h
|
NO_DEFAULT_PATH
|
||||||
${TCLTK_POSSIBLE_INCLUDE_PATHS}
|
)
|
||||||
)
|
FIND_PATH(TCL_INCLUDE_PATH
|
||||||
|
NAMES tcl.h
|
||||||
|
PATHS ${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
|
# handle the QUIETLY and REQUIRED arguments and set TCL_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
|
@ -37,32 +37,36 @@ 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 "${TK_LIBRARY}" PATH)
|
||||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
|
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
|
||||||
|
|
||||||
GET_FILENAME_COMPONENT(
|
SET(TCLTK_POSSIBLE_LIB_PATHS
|
||||||
ActiveTcl_CurrentVersion
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
|
||||||
NAME)
|
|
||||||
|
|
||||||
SET (TCLTK_POSSIBLE_LIB_PATHS
|
|
||||||
"${TCL_INCLUDE_PATH_PARENT}/lib"
|
"${TCL_INCLUDE_PATH_PARENT}/lib"
|
||||||
"${TK_INCLUDE_PATH_PARENT}/lib"
|
"${TK_INCLUDE_PATH_PARENT}/lib"
|
||||||
"${TCL_LIBRARY_PATH}"
|
"${TCL_LIBRARY_PATH}"
|
||||||
"${TK_LIBRARY_PATH}"
|
"${TK_LIBRARY_PATH}"
|
||||||
"${TCL_TCLSH_PATH_PARENT}/lib"
|
"${TCL_TCLSH_PATH_PARENT}/lib"
|
||||||
"${TK_WISH_PATH_PARENT}/lib"
|
"${TK_WISH_PATH_PARENT}/lib"
|
||||||
"[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"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/lib"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib"
|
|
||||||
"$ENV{ProgramFiles}/Tcl/Lib"
|
|
||||||
"C:/Program Files/Tcl/lib"
|
|
||||||
"C:/Tcl/lib"
|
|
||||||
/usr/lib
|
/usr/lib
|
||||||
/usr/local/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"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/lib"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib"
|
||||||
|
"$ENV{ProgramFiles}/Tcl/Lib"
|
||||||
|
"C:/Program Files/Tcl/lib"
|
||||||
|
"C:/Tcl/lib"
|
||||||
|
)
|
||||||
|
ENDIF(WIN32)
|
||||||
|
|
||||||
FIND_LIBRARY(TCL_STUB_LIBRARY
|
FIND_LIBRARY(TCL_STUB_LIBRARY
|
||||||
NAMES tclstub
|
NAMES tclstub
|
||||||
tclstub86 tclstub8.6
|
tclstub86 tclstub8.6
|
||||||
|
@ -23,25 +23,29 @@ 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 "${TK_LIBRARY}" PATH)
|
||||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" 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
|
SET(TCLTK_POSSIBLE_BIN_PATHS
|
||||||
"${TCL_INCLUDE_PATH_PARENT}/bin"
|
"${TCL_INCLUDE_PATH_PARENT}/bin"
|
||||||
"${TK_INCLUDE_PATH_PARENT}/bin"
|
"${TK_INCLUDE_PATH_PARENT}/bin"
|
||||||
"${TCL_LIBRARY_PATH_PARENT}/bin"
|
"${TCL_LIBRARY_PATH_PARENT}/bin"
|
||||||
"${TK_LIBRARY_PATH_PARENT}/bin"
|
"${TK_LIBRARY_PATH_PARENT}/bin"
|
||||||
"${TK_WISH_PATH_PARENT}/bin"
|
"${TK_WISH_PATH_PARENT}/bin"
|
||||||
"[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"
|
IF(WIN32)
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/bin"
|
GET_FILENAME_COMPONENT(
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/bin"
|
ActiveTcl_CurrentVersion
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/bin"
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
|
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"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/bin"
|
||||||
|
"[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
|
SET(TCL_TCLSH_NAMES
|
||||||
tclsh
|
tclsh
|
||||||
@ -51,16 +55,16 @@ SET(TCL_TCLSH_NAMES
|
|||||||
tclsh83 tclsh8.3
|
tclsh83 tclsh8.3
|
||||||
tclsh82 tclsh8.2
|
tclsh82 tclsh8.2
|
||||||
tclsh80 tclsh8.0
|
tclsh80 tclsh8.0
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_PROGRAM(TCL_TCLSH
|
FIND_PROGRAM(TCL_TCLSH
|
||||||
NAMES ${TCL_TCLSH_NAMES}
|
NAMES ${TCL_TCLSH_NAMES}
|
||||||
PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
|
PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
|
||||||
)
|
)
|
||||||
FIND_PROGRAM(TCL_TCLSH
|
FIND_PROGRAM(TCL_TCLSH
|
||||||
NAMES ${TCL_TCLSH_NAMES}
|
NAMES ${TCL_TCLSH_NAMES}
|
||||||
PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
|
PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
|
||||||
)
|
)
|
||||||
|
|
||||||
# handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if
|
# handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
|
@ -22,25 +22,29 @@ 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 "${TK_LIBRARY}" PATH)
|
||||||
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" 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
|
SET(TCLTK_POSSIBLE_BIN_PATHS
|
||||||
"${TCL_INCLUDE_PATH_PARENT}/bin"
|
"${TCL_INCLUDE_PATH_PARENT}/bin"
|
||||||
"${TK_INCLUDE_PATH_PARENT}/bin"
|
"${TK_INCLUDE_PATH_PARENT}/bin"
|
||||||
"${TCL_LIBRARY_PATH_PARENT}/bin"
|
"${TCL_LIBRARY_PATH_PARENT}/bin"
|
||||||
"${TK_LIBRARY_PATH_PARENT}/bin"
|
"${TK_LIBRARY_PATH_PARENT}/bin"
|
||||||
"${TCL_TCLSH_PATH_PARENT}/bin"
|
"${TCL_TCLSH_PATH_PARENT}/bin"
|
||||||
"[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"
|
IF(WIN32)
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/bin"
|
GET_FILENAME_COMPONENT(
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/bin"
|
ActiveTcl_CurrentVersion
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/bin"
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
|
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"
|
||||||
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/bin"
|
||||||
|
"[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
|
SET(TK_WISH_NAMES
|
||||||
wish
|
wish
|
||||||
@ -50,15 +54,15 @@ SET(TK_WISH_NAMES
|
|||||||
wish83 wish8.3
|
wish83 wish8.3
|
||||||
wish82 wish8.2
|
wish82 wish8.2
|
||||||
wish80 wish8.0
|
wish80 wish8.0
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_PROGRAM(TK_WISH
|
FIND_PROGRAM(TK_WISH
|
||||||
NAMES ${TK_WISH_NAMES}
|
NAMES ${TK_WISH_NAMES}
|
||||||
PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
|
PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
|
||||||
)
|
)
|
||||||
FIND_PROGRAM(TK_WISH
|
FIND_PROGRAM(TK_WISH
|
||||||
NAMES ${TK_WISH_NAMES}
|
NAMES ${TK_WISH_NAMES}
|
||||||
PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
|
PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
|
||||||
)
|
)
|
||||||
|
|
||||||
MARK_AS_ADVANCED(TK_WISH)
|
MARK_AS_ADVANCED(TK_WISH)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user