diff options
Diffstat (limited to 'Modules/FindTclStub.cmake')
| -rw-r--r-- | Modules/FindTclStub.cmake | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/Modules/FindTclStub.cmake b/Modules/FindTclStub.cmake index 1e83508..cb77271 100644 --- a/Modules/FindTclStub.cmake +++ b/Modules/FindTclStub.cmake @@ -34,32 +34,32 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -INCLUDE(FindTCL) +include(FindTCL) -GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH) -GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH) -STRING(REGEX REPLACE +get_filename_component(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH) +get_filename_component(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH) +string(REGEX REPLACE "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}") -GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH) -GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH) -STRING(REGEX REPLACE +get_filename_component(TK_WISH_PATH "${TK_WISH}" PATH) +get_filename_component(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH) +string(REGEX REPLACE "^.*wish([0-9]\\.*[0-9]).*$" "\\1" TK_WISH_VERSION "${TK_WISH}") -GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH) -GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH) +get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH) +get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH) -GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH) -GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH) -STRING(REGEX REPLACE +get_filename_component(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH) +get_filename_component(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH) +string(REGEX REPLACE "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_LIBRARY_VERSION "${TCL_LIBRARY}") -GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH) -GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH) -STRING(REGEX REPLACE +get_filename_component(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH) +get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH) +string(REGEX REPLACE "^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}") -SET(TCLTK_POSSIBLE_LIB_PATHS +set(TCLTK_POSSIBLE_LIB_PATHS "${TCL_INCLUDE_PATH_PARENT}/lib" "${TK_INCLUDE_PATH_PARENT}/lib" "${TCL_LIBRARY_PATH}" @@ -68,12 +68,12 @@ SET(TCLTK_POSSIBLE_LIB_PATHS "${TK_WISH_PATH_PARENT}/lib" ) -IF(WIN32) - GET_FILENAME_COMPONENT( +if(WIN32) + get_filename_component( ActiveTcl_CurrentVersion "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]" NAME) - SET(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS} + 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" @@ -85,9 +85,9 @@ IF(WIN32) "C:/Program Files/Tcl/lib" "C:/Tcl/lib" ) -ENDIF(WIN32) +endif(WIN32) -FIND_LIBRARY(TCL_STUB_LIBRARY +find_library(TCL_STUB_LIBRARY NAMES tclstub tclstub${TK_LIBRARY_VERSION} tclstub${TCL_TCLSH_VERSION} tclstub${TK_WISH_VERSION} @@ -100,7 +100,7 @@ FIND_LIBRARY(TCL_STUB_LIBRARY PATHS ${TCLTK_POSSIBLE_LIB_PATHS} ) -FIND_LIBRARY(TK_STUB_LIBRARY +find_library(TK_STUB_LIBRARY NAMES tkstub tkstub${TCL_LIBRARY_VERSION} tkstub${TCL_TCLSH_VERSION} tkstub${TK_WISH_VERSION} @@ -113,7 +113,7 @@ FIND_LIBRARY(TK_STUB_LIBRARY PATHS ${TCLTK_POSSIBLE_LIB_PATHS} ) -FIND_LIBRARY(TTK_STUB_LIBRARY +find_library(TTK_STUB_LIBRARY NAMES ttkstub ttkstub${TCL_LIBRARY_VERSION} ttkstub${TCL_TCLSH_VERSION} ttkstub${TK_WISH_VERSION} @@ -124,7 +124,7 @@ FIND_LIBRARY(TTK_STUB_LIBRARY PATHS ${TCLTK_POSSIBLE_LIB_PATHS} ) -MARK_AS_ADVANCED( +mark_as_advanced( TCL_STUB_LIBRARY TK_STUB_LIBRARY ) |