[brlcad-commits] SF.net SVN: brlcad:[42965] brlcad/branches/cmake
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2011-02-03 18:14:26
|
Revision: 42965 http://brlcad.svn.sourceforge.net/brlcad/?rev=42965&view=rev Author: starseeker Date: 2011-02-03 18:14:19 +0000 (Thu, 03 Feb 2011) Log Message: ----------- ws, update togl copy of FindTCL.cmake Modified Paths: -------------- brlcad/branches/cmake/misc/CMake/FindTCL.cmake brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake =================================================================== --- brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2011-02-03 18:11:42 UTC (rev 42964) +++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2011-02-03 18:14:19 UTC (rev 42965) @@ -610,18 +610,18 @@ ELSE(MSVC) SET(TCL_EXE_SUFFICX "") ENDIF(MSVC) - STRING(REGEX REPLACE ".*TCL_EXEC_PREFIX='(.+)'.*" "\\1" TCL_TCLSH_EXECUTABLE ${line}) - IF (EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") - SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") - ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") - SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") - ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") - SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") - ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") - SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") - ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh") - SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh") - ENDIF() + STRING(REGEX REPLACE ".*TCL_EXEC_PREFIX='(.+)'.*" "\\1" TCL_TCLSH_EXECUTABLE ${line}) + IF (EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh") + SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh") + ENDIF() endif() IF(${line} MATCHES "TCL_STUB_LIB_PATH") STRING(REGEX REPLACE ".*TCL_STUB_LIB_PATH='(.+)/lib.*" "\\1" TCL_STUB_LIB_PATH ${line}) @@ -660,17 +660,17 @@ ELSE(MSVC) SET(TK_EXE_SUFFIX "") ENDIF(MSVC) - STRING(REGEX REPLACE ".*TK_EXEC_PREFIX='(.+)'.*" "\\1" TCL_WISH_EXECUTABLE ${line}) - IF (EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") - SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") - ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") - SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") - ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") - SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") - ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") - SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") - ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish") - SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish") + STRING(REGEX REPLACE ".*TK_EXEC_PREFIX='(.+)'.*" "\\1" TCL_WISH_EXECUTABLE ${line}) + IF (EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish") + SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish") ENDIF() endif() ENDFOREACH(line ${ENT}) @@ -809,190 +809,190 @@ # full path to the lib directory, catch that by adding the parent path # to the list to check IF(NOT TCL_FOUND) -IF(TCL_PREFIX) - SET(TCL_LIBRARY "NOTFOUND") - SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_PREFIX}/lib) - SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_PREFIX}) - GET_FILENAME_COMPONENT(TCL_LIB_PATH_PARENT "${TCL_PREFIX}" PATH) - SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_LIB_PATH_PARENT}/lib) - SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_LIB_PATH_PARENT}) - LIST(REMOVE_DUPLICATES TCL_PREFIX_LIBDIRS) - FIND_LIBRARY_VERSIONS(tcl TCL_PREFIX_LIBDIRS NO_SYSTEM_PATH) - SET(FOUND_FILES "${TCL_tcl_LIST}") - FIND_CONFIG_FILES(FOUND_FILES TCLCONFIG_LIST tclConfig.sh) - IF(TCL_REQUIRE_TK) - FIND_LIBRARY_VERSIONS(tk TCL_PREFIX_LIBDIRS NO_SYSTEM_PATH) - SET(FOUND_FILES "${TCL_tk_LIST}") - FIND_CONFIG_FILES(FOUND_FILES TKCONFIG_LIST tkConfig.sh) - ENDIF(TCL_REQUIRE_TK) -ELSE(TCL_PREFIX) - SET(TCLCONFIG_LIST "") - IF(APPLE) - INCLUDE(CMakeFindFrameworks) - CMAKE_FIND_FRAMEWORKS(Tcl) - FOREACH(dir ${Tcl_FRAMEWORKS}) - set(tclconf "tclConfig.sh-NOTFOUND") - find_file(tclconf tclConfig.sh PATHS ${dir}) - if(NOT tclconf MATCHES "NOTFOUND$") - SET(TCLCONFIG_LIST "${TCLCONFIG_LIST}${tclconf};") - endif(NOT tclconf MATCHES "NOTFOUND$") - ENDFOREACH(dir ${Tcl_FRAMEWORKS}) + IF(TCL_PREFIX) + SET(TCL_LIBRARY "NOTFOUND") + SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_PREFIX}/lib) + SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_PREFIX}) + GET_FILENAME_COMPONENT(TCL_LIB_PATH_PARENT "${TCL_PREFIX}" PATH) + SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_LIB_PATH_PARENT}/lib) + SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_LIB_PATH_PARENT}) + LIST(REMOVE_DUPLICATES TCL_PREFIX_LIBDIRS) + FIND_LIBRARY_VERSIONS(tcl TCL_PREFIX_LIBDIRS NO_SYSTEM_PATH) + SET(FOUND_FILES "${TCL_tcl_LIST}") + FIND_CONFIG_FILES(FOUND_FILES TCLCONFIG_LIST tclConfig.sh) IF(TCL_REQUIRE_TK) - CMAKE_FIND_FRAMEWORKS(Tk) - FOREACH(dir ${Tk_FRAMEWORKS}) - set(tkconf "tkConfig.sh-NOTFOUND") - find_file(tkconf tkConfig.sh PATHS ${dir}) - if(NOT tkconf MATCHES "NOTFOUND$") - SET(TKCONFIG_LIST "${TKCONFIG_LIST}${tkconf};") - endif(NOT tkconf MATCHES "NOTFOUND$") - ENDFOREACH(dir ${Tk_FRAMEWORKS}) + FIND_LIBRARY_VERSIONS(tk TCL_PREFIX_LIBDIRS NO_SYSTEM_PATH) + SET(FOUND_FILES "${TCL_tk_LIST}") + FIND_CONFIG_FILES(FOUND_FILES TKCONFIG_LIST tkConfig.sh) ENDIF(TCL_REQUIRE_TK) - ENDIF(APPLE) - IF(NOT APPLE OR NOT TCL_USE_FRAMEWORK_ONLY) - SET(PATHLIST "$ENV{LD_LIBRARY_PATH}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DYLD_FALLBACK_LIBRARY_PATH}:$ENV{PATH}") - SET(PATHLIST "${TCL_ADDITIONAL_SEARCH_PATHS}:${PATHLIST}") - IF(WIN32) - WIN32TCLPATHS(PATHLIST "") - ENDIF(WIN32) - STRING(REGEX REPLACE "/s?bin:" ":" PATHLIST "${PATHLIST}") - STRING(REGEX REPLACE "/s?bin;" ":" PATHLIST "${PATHLIST}") - STRING(REGEX REPLACE "/lib6?4?:" ":" PATHLIST "${PATHLIST}") - STRING(REGEX REPLACE "/lib6?4?;" ":" PATHLIST "${PATHLIST}") - STRING(REGEX REPLACE ":" ";" PATHLIST "${PATHLIST}") - LIST(REMOVE_DUPLICATES PATHLIST) - FOREACH(foundpath ${PATHLIST}) - FOREACH(pattern ${TCL_PATH_NOMATCH_PATTERNS}) - if(foundpath MATCHES "${pattern}") - LIST(REMOVE_ITEM PATHLIST ${foundpath}) - endif(foundpath MATCHES "${pattern}") - ENDFOREACH(pattern ${TCL_PATH_NOMATCH_PATTERNS}) - ENDFOREACH() - SET(TCLPATHLIST "${PATHLIST}") - SET(TKPATHLIST "${PATHLIST}") - FIND_POSSIBLE_PATHS("tclsh" "tcl" TCLPATHLIST NO_SYSTEM_PATH) - IF(TCL_REQUIRE_TK) - FIND_POSSIBLE_PATHS("wish" "tk" TKPATHLIST NO_SYSTEM_PATH) - ENDIF(TCL_REQUIRE_TK) - # Hunt up tclConfig.sh files - FIND_CONFIG_FILES(TCLPATHLIST TCLCONFIG_LIST tclConfig.sh) - # Hunt up tkConfig.sh files - FIND_CONFIG_FILES(TKPATHLIST TKCONFIG_LIST tkConfig.sh) - ENDIF(NOT APPLE OR NOT TCL_USE_FRAMEWORK_ONLY) -ENDIF(TCL_PREFIX) -SET(TCLVALID 0) -RESET_TCL_VARS() -FOREACH(tcl_config_file ${TCLCONFIG_LIST}) - IF(NOT TCLVALID) - RESET_TCL_VARS() - READ_TCLCONFIG_FILE(${tcl_config_file}) - SET(TCLVALID 1) - SET(CURRENTTCLVERSION "${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.${TCL_VERSION_PATCH}") - VALIDATE_VERSION(TCLVALID ${CURRENTTCLVERSION}) - IF(TCLVALID) - GET_FILENAME_COMPONENT(TCL_CONF_PREFIX "${tcl_config_file}" PATH) - GET_FILENAME_COMPONENT(TCL_LIBRARY_DIR2 "${TCL_CONF_PREFIX}" PATH) - FIND_LIBRARY_PATHS(TCL_LIBRARY_SEARCH_PATHS TCL_PREFIX ${TCL_VERSION_MAJOR} ${TCL_VERSION_MINOR}) - SET(TCL_LIBRARY_SEARCH_PATHS "${TCL_CONF_PREFIX};${TCL_LIBRARY_DIR2};${TCL_LIBRARY_SEARCH_PATHS}") - FIND_LIBRARY(TCL_LIBRARY tcl Tcl tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR} tcl${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR} PATHS ${TCL_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) - FIND_LIBRARY(TCL_STUB_LIBRARY tclstub${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR} tclstub${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR} PATHS ${TCL_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) - ENDIF(TCLVALID) - VALIDATE_TCL(TCLVALID) - IF(TCLVALID) + ELSE(TCL_PREFIX) + SET(TCLCONFIG_LIST "") + IF(APPLE) + INCLUDE(CMakeFindFrameworks) + CMAKE_FIND_FRAMEWORKS(Tcl) + FOREACH(dir ${Tcl_FRAMEWORKS}) + set(tclconf "tclConfig.sh-NOTFOUND") + find_file(tclconf tclConfig.sh PATHS ${dir}) + if(NOT tclconf MATCHES "NOTFOUND$") + SET(TCLCONFIG_LIST "${TCLCONFIG_LIST}${tclconf};") + endif(NOT tclconf MATCHES "NOTFOUND$") + ENDFOREACH(dir ${Tcl_FRAMEWORKS}) IF(TCL_REQUIRE_TK) - SET(TKVALID 0) - FOREACH(tk_config_file ${TKCONFIG_LIST}) + CMAKE_FIND_FRAMEWORKS(Tk) + FOREACH(dir ${Tk_FRAMEWORKS}) + set(tkconf "tkConfig.sh-NOTFOUND") + find_file(tkconf tkConfig.sh PATHS ${dir}) + if(NOT tkconf MATCHES "NOTFOUND$") + SET(TKCONFIG_LIST "${TKCONFIG_LIST}${tkconf};") + endif(NOT tkconf MATCHES "NOTFOUND$") + ENDFOREACH(dir ${Tk_FRAMEWORKS}) + ENDIF(TCL_REQUIRE_TK) + ENDIF(APPLE) + IF(NOT APPLE OR NOT TCL_USE_FRAMEWORK_ONLY) + SET(PATHLIST "$ENV{LD_LIBRARY_PATH}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DYLD_FALLBACK_LIBRARY_PATH}:$ENV{PATH}") + SET(PATHLIST "${TCL_ADDITIONAL_SEARCH_PATHS}:${PATHLIST}") + IF(WIN32) + WIN32TCLPATHS(PATHLIST "") + ENDIF(WIN32) + STRING(REGEX REPLACE "/s?bin:" ":" PATHLIST "${PATHLIST}") + STRING(REGEX REPLACE "/s?bin;" ":" PATHLIST "${PATHLIST}") + STRING(REGEX REPLACE "/lib6?4?:" ":" PATHLIST "${PATHLIST}") + STRING(REGEX REPLACE "/lib6?4?;" ":" PATHLIST "${PATHLIST}") + STRING(REGEX REPLACE ":" ";" PATHLIST "${PATHLIST}") + LIST(REMOVE_DUPLICATES PATHLIST) + FOREACH(foundpath ${PATHLIST}) + FOREACH(pattern ${TCL_PATH_NOMATCH_PATTERNS}) + if(foundpath MATCHES "${pattern}") + LIST(REMOVE_ITEM PATHLIST ${foundpath}) + endif(foundpath MATCHES "${pattern}") + ENDFOREACH(pattern ${TCL_PATH_NOMATCH_PATTERNS}) + ENDFOREACH() + SET(TCLPATHLIST "${PATHLIST}") + SET(TKPATHLIST "${PATHLIST}") + FIND_POSSIBLE_PATHS("tclsh" "tcl" TCLPATHLIST NO_SYSTEM_PATH) + IF(TCL_REQUIRE_TK) + FIND_POSSIBLE_PATHS("wish" "tk" TKPATHLIST NO_SYSTEM_PATH) + ENDIF(TCL_REQUIRE_TK) + # Hunt up tclConfig.sh files + FIND_CONFIG_FILES(TCLPATHLIST TCLCONFIG_LIST tclConfig.sh) + # Hunt up tkConfig.sh files + FIND_CONFIG_FILES(TKPATHLIST TKCONFIG_LIST tkConfig.sh) + ENDIF(NOT APPLE OR NOT TCL_USE_FRAMEWORK_ONLY) + ENDIF(TCL_PREFIX) + SET(TCLVALID 0) + RESET_TCL_VARS() + FOREACH(tcl_config_file ${TCLCONFIG_LIST}) + IF(NOT TCLVALID) + RESET_TCL_VARS() + READ_TCLCONFIG_FILE(${tcl_config_file}) + SET(TCLVALID 1) + SET(CURRENTTCLVERSION "${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.${TCL_VERSION_PATCH}") + VALIDATE_VERSION(TCLVALID ${CURRENTTCLVERSION}) + IF(TCLVALID) + GET_FILENAME_COMPONENT(TCL_CONF_PREFIX "${tcl_config_file}" PATH) + GET_FILENAME_COMPONENT(TCL_LIBRARY_DIR2 "${TCL_CONF_PREFIX}" PATH) + FIND_LIBRARY_PATHS(TCL_LIBRARY_SEARCH_PATHS TCL_PREFIX ${TCL_VERSION_MAJOR} ${TCL_VERSION_MINOR}) + SET(TCL_LIBRARY_SEARCH_PATHS "${TCL_CONF_PREFIX};${TCL_LIBRARY_DIR2};${TCL_LIBRARY_SEARCH_PATHS}") + FIND_LIBRARY(TCL_LIBRARY tcl Tcl tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR} tcl${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR} PATHS ${TCL_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) + FIND_LIBRARY(TCL_STUB_LIBRARY tclstub${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR} tclstub${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR} PATHS ${TCL_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) + ENDIF(TCLVALID) + VALIDATE_TCL(TCLVALID) + IF(TCLVALID) + IF(TCL_REQUIRE_TK) + SET(TKVALID 0) + FOREACH(tk_config_file ${TKCONFIG_LIST}) + IF(NOT TKVALID) + RESET_TK_VARS() + READ_TKCONFIG_FILE(${tk_config_file}) + SET(TKVALID 0) + SET(CURRENTTKVERSION "${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.${TK_VERSION_PATCH}") + SET(vtcltkcompare 0) + IF(${CURRENTTCLVERSION} VERSION_EQUAL ${CURRENTTKVERSION}) + SET(TKVALID 1) + ELSE() + SET(TKVALID 0) + ENDIF() + IF(TKVALID) + GET_FILENAME_COMPONENT(TCL_TK_CONF_PREFIX "${tk_config_file}" PATH) + GET_FILENAME_COMPONENT(TCL_TK_LIBRARY_DIR2 "${TCL_TK_CONF_PREFIX}" PATH) + FIND_LIBRARY_PATHS(TCL_TK_LIBRARY_SEARCH_PATHS TK_PREFIX ${TK_VERSION_MAJOR} ${TK_VERSION_MINOR}) + SET(TCL_TK_LIBRARY_SEARCH_PATHS "${TCL_TK_CONF_PREFIX};${TCL_TK_LIBRARY_DIR2};${TCL_TK_LIBRARY_SEARCH_PATHS}") + FIND_LIBRARY(TCL_TK_LIBRARY tk Tk tk${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} tk${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TCL_TK_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) + FIND_LIBRARY(TCL_TK_STUB_LIBRARY tkstub tkstub${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} tkstub${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TCL_TK_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) + VALIDATE_TK(TKVALID) + ENDIF(TKVALID) + ENDIF(NOT TKVALID) + ENDFOREACH(tk_config_file ${TKCONFIG_LIST}) IF(NOT TKVALID) - RESET_TK_VARS() - READ_TKCONFIG_FILE(${tk_config_file}) - SET(TKVALID 0) - SET(CURRENTTKVERSION "${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.${TK_VERSION_PATCH}") - SET(vtcltkcompare 0) - IF(${CURRENTTCLVERSION} VERSION_EQUAL ${CURRENTTKVERSION}) - SET(TKVALID 1) - ELSE() - SET(TKVALID 0) - ENDIF() - IF(TKVALID) - GET_FILENAME_COMPONENT(TCL_TK_CONF_PREFIX "${tk_config_file}" PATH) - GET_FILENAME_COMPONENT(TCL_TK_LIBRARY_DIR2 "${TCL_TK_CONF_PREFIX}" PATH) - FIND_LIBRARY_PATHS(TCL_TK_LIBRARY_SEARCH_PATHS TK_PREFIX ${TK_VERSION_MAJOR} ${TK_VERSION_MINOR}) - SET(TCL_TK_LIBRARY_SEARCH_PATHS "${TCL_TK_CONF_PREFIX};${TCL_TK_LIBRARY_DIR2};${TCL_TK_LIBRARY_SEARCH_PATHS}") - FIND_LIBRARY(TCL_TK_LIBRARY tk Tk tk${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} tk${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TCL_TK_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) - FIND_LIBRARY(TCL_TK_STUB_LIBRARY tkstub tkstub${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} tkstub${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TCL_TK_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) - VALIDATE_TK(TKVALID) - ENDIF(TKVALID) + SET(TCLVALID 0) ENDIF(NOT TKVALID) - ENDFOREACH(tk_config_file ${TKCONFIG_LIST}) - IF(NOT TKVALID) - SET(TCLVALID 0) - ENDIF(NOT TKVALID) - ENDIF(TCL_REQUIRE_TK) - ENDIF(TCLVALID) - ENDIF(NOT TCLVALID) -ENDFOREACH(tcl_config_file ${TCLCONFIG_LIST}) + ENDIF(TCL_REQUIRE_TK) + ENDIF(TCLVALID) + ENDIF(NOT TCLVALID) + ENDFOREACH(tcl_config_file ${TCLCONFIG_LIST}) -# If we still don't have anything by now, we may have a system without tclConfig.sh and tkConfig.sh -# Back to trying to guess values, using the TCLPATHLIST and TKPATHLIST arrays of paths. This is -# attempted ONLY if we are looking for a Tcl/Tk installation to call as a scripting engine and not -# as C libraries to build against - the autotools/TEA based Tcl/Tk world requires those files be -# present and any ExternalProject build attempting to use a Tcl/Tk installation without them would -# not succeed. -IF(NOT TCLVALID AND NOT TCL_NEED_HEADERS) - SET(PATHLIST "${TCLPATHLIST};${TKPATHLIST}") - LIST(REMOVE_DUPLICATES PATHLIST) - FOREACH(MAJORNUM ${TCL_POSSIBLE_MAJOR_VERSIONS}) - FOREACH(MINORNUM ${TCL_POSSIBLE_MINOR_VERSIONS}) - FOREACH(SPATH ${PATHLIST}) - IF(NOT TCLVALID) - RESET_TCL_VARS() - SET(CURRENT_SEARCH_VERSION "${MAJORNUM}.${MINORNUM}") - VALIDATE_VERSION(dosearch ${CURRENT_SEARCH_VERSION}) - IF(dosearch) - FIND_LIBRARY_PATHS(TCL_LIBRARY_SEARCH_PATHS SPATH ${MAJORNUM} ${MINORNUM}) - FIND_PROGRAM_PATHS(TCL_PROGRAM_SEARCH_PATHS SPATH ${MAJORNUM} ${MINORNUM}) - FIND_PROGRAM(TCL_TCLSH_EXECUTABLE NAMES tclsh${MAJORNUM}.${MINORNUM} tclsh${MAJORNUM}${MINORNUM} PATHS ${TCL_PROGRAM_SEARCH_PATHS} NO_SYSTEM_PATH) - ENDIF(dosearch) - VALIDATE_TCL(TCLVALID) - IF(TCLVALID) - IF(TCL_REQUIRE_TK) - SET(TKVALID 0) - RESET_TK_VARS() - FIND_PROGRAM(TCL_WISH_EXECUTABLE NAMES wish${MAJORNUM}.${MINORNUM} wish${MAJORNUM}${MINORNUM} PATHS ${TCL_PROGRAM_SEARCH_PATHS} NO_SYSTEM_PATH) - VALIDATE_TK(TKVALID) - IF(NOT TKVALID) - SET(TCLVALID 0) - RESET_TCL_VARS() + # If we still don't have anything by now, we may have a system without tclConfig.sh and tkConfig.sh + # Back to trying to guess values, using the TCLPATHLIST and TKPATHLIST arrays of paths. This is + # attempted ONLY if we are looking for a Tcl/Tk installation to call as a scripting engine and not + # as C libraries to build against - the autotools/TEA based Tcl/Tk world requires those files be + # present and any ExternalProject build attempting to use a Tcl/Tk installation without them would + # not succeed. + IF(NOT TCLVALID AND NOT TCL_NEED_HEADERS) + SET(PATHLIST "${TCLPATHLIST};${TKPATHLIST}") + LIST(REMOVE_DUPLICATES PATHLIST) + FOREACH(MAJORNUM ${TCL_POSSIBLE_MAJOR_VERSIONS}) + FOREACH(MINORNUM ${TCL_POSSIBLE_MINOR_VERSIONS}) + FOREACH(SPATH ${PATHLIST}) + IF(NOT TCLVALID) + RESET_TCL_VARS() + SET(CURRENT_SEARCH_VERSION "${MAJORNUM}.${MINORNUM}") + VALIDATE_VERSION(dosearch ${CURRENT_SEARCH_VERSION}) + IF(dosearch) + FIND_LIBRARY_PATHS(TCL_LIBRARY_SEARCH_PATHS SPATH ${MAJORNUM} ${MINORNUM}) + FIND_PROGRAM_PATHS(TCL_PROGRAM_SEARCH_PATHS SPATH ${MAJORNUM} ${MINORNUM}) + FIND_PROGRAM(TCL_TCLSH_EXECUTABLE NAMES tclsh${MAJORNUM}.${MINORNUM} tclsh${MAJORNUM}${MINORNUM} PATHS ${TCL_PROGRAM_SEARCH_PATHS} NO_SYSTEM_PATH) + ENDIF(dosearch) + VALIDATE_TCL(TCLVALID) + IF(TCLVALID) + IF(TCL_REQUIRE_TK) + SET(TKVALID 0) RESET_TK_VARS() - ENDIF(NOT TKVALID) - ENDIF(TCL_REQUIRE_TK) - ELSE(TCLVALID) - RESET_TCL_VARS() - ENDIF(TCLVALID) - ENDIF(NOT TCLVALID) - ENDFOREACH(SPATH ${PATHLIST}) + FIND_PROGRAM(TCL_WISH_EXECUTABLE NAMES wish${MAJORNUM}.${MINORNUM} wish${MAJORNUM}${MINORNUM} PATHS ${TCL_PROGRAM_SEARCH_PATHS} NO_SYSTEM_PATH) + VALIDATE_TK(TKVALID) + IF(NOT TKVALID) + SET(TCLVALID 0) + RESET_TCL_VARS() + RESET_TK_VARS() + ENDIF(NOT TKVALID) + ENDIF(TCL_REQUIRE_TK) + ELSE(TCLVALID) + RESET_TCL_VARS() + ENDIF(TCLVALID) + ENDIF(NOT TCLVALID) + ENDFOREACH(SPATH ${PATHLIST}) + ENDFOREACH() ENDFOREACH() - ENDFOREACH() -ENDIF(NOT TCLVALID AND NOT TCL_NEED_HEADERS) + ENDIF(NOT TCLVALID AND NOT TCL_NEED_HEADERS) -# By this point we have found everything we're going to find - set variables to be exposed as results -SET(TCL_TCLSH ${TCL_TCLSH_EXECUTABLE}) -SET(TK_WISH ${TCL_WISH_EXECUTABLE}) -SET(TK_LIBRARY ${TCL_TK_LIBRARY}) # Deprecated -SET(TK_STUB_LIBRARY ${TCL_TK_STUB_LIBRARY}) -SET(TCL_INCLUDE_DIRS ${TCL_INCLUDE_PATH} ${TK_INCLUDE_PATH} ${TCL_INCLUDE_PATH}/../generic) -SET(TCL_LIBRARIES ${TCL_LIBRARY} ${TK_LIBRARY}) -SET(TCL_STUB_LIBRARIES ${TCL_STUB_LIBRARY} ${TK_STUB_LIBRARY}) -SET(TCL_ROOT_PATH ${TCL_CONF_PREFIX}) -SET(TCL_VERSION_STRING "${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.${TCL_VERSION_PATCH}") -FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL DEFAULT_MSG TCL_LIBRARY ${PACKAGE_HANDLE_VARS}) -IF(TCL_REQUIRE_TK) - SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS};TCL_LIBRARY") - FIND_PACKAGE_HANDLE_STANDARD_ARGS(TK DEFAULT_MSG TCL_TK_LIBRARY ${PACKAGE_HANDLE_VARS}) -ENDIF(TCL_REQUIRE_TK) + # By this point we have found everything we're going to find - set variables to be exposed as results + SET(TCL_TCLSH ${TCL_TCLSH_EXECUTABLE}) + SET(TK_WISH ${TCL_WISH_EXECUTABLE}) + SET(TK_LIBRARY ${TCL_TK_LIBRARY}) # Deprecated + SET(TK_STUB_LIBRARY ${TCL_TK_STUB_LIBRARY}) + SET(TCL_INCLUDE_DIRS ${TCL_INCLUDE_PATH} ${TK_INCLUDE_PATH} ${TCL_INCLUDE_PATH}/../generic) + SET(TCL_LIBRARIES ${TCL_LIBRARY} ${TK_LIBRARY}) + SET(TCL_STUB_LIBRARIES ${TCL_STUB_LIBRARY} ${TK_STUB_LIBRARY}) + SET(TCL_ROOT_PATH ${TCL_CONF_PREFIX}) + SET(TCL_VERSION_STRING "${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.${TCL_VERSION_PATCH}") + FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL DEFAULT_MSG TCL_LIBRARY ${PACKAGE_HANDLE_VARS}) + IF(TCL_REQUIRE_TK) + SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS};TCL_LIBRARY") + FIND_PACKAGE_HANDLE_STANDARD_ARGS(TK DEFAULT_MSG TCL_TK_LIBRARY ${PACKAGE_HANDLE_VARS}) + ENDIF(TCL_REQUIRE_TK) -FOREACH(pkgvar ${PACKAGE_HANDLE_VARS}) - SET(${pkgvar} ${${pkgvar}} CACHE STRING "set by FindTCL" FORCE) -ENDFOREACH(pkgvar ${PACKAGE_HANDLE_VARS}) + FOREACH(pkgvar ${PACKAGE_HANDLE_VARS}) + SET(${pkgvar} ${${pkgvar}} CACHE STRING "set by FindTCL" FORCE) + ENDFOREACH(pkgvar ${PACKAGE_HANDLE_VARS}) ENDIF(NOT TCL_FOUND) @@ -1032,5 +1032,5 @@ conffile USE_TCL_STUBS USE_TK_STUBS -) + ) Modified: brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake =================================================================== --- brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake 2011-02-03 18:11:42 UTC (rev 42964) +++ brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake 2011-02-03 18:14:19 UTC (rev 42965) @@ -606,24 +606,22 @@ endif() IF(${line} MATCHES "TCL_EXEC_PREFIX") IF(MSVC) - STRING(REGEX REPLACE ".*TCL_EXEC_PREFIX='(.+)'.*" "\\1" TCL_TCLSH_EXECUTABLE ${line}) - IF (EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}.exe") - SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}.exe") - ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.exe") - SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.exe") - ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh.exe") - SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh.exe") - ENDIF() + SET(TCL_EXE_SUFFICX ".exe") ELSE(MSVC) - STRING(REGEX REPLACE ".*TCL_EXEC_PREFIX='(.+)'.*" "\\1" TCL_TCLSH_EXECUTABLE ${line}) - IF (EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}") - SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}") - ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}") - SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}") - ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh") - SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh") - ENDIF() + SET(TCL_EXE_SUFFICX "") ENDIF(MSVC) + STRING(REGEX REPLACE ".*TCL_EXEC_PREFIX='(.+)'.*" "\\1" TCL_TCLSH_EXECUTABLE ${line}) + IF (EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh") + SET(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh") + ENDIF() endif() IF(${line} MATCHES "TCL_STUB_LIB_PATH") STRING(REGEX REPLACE ".*TCL_STUB_LIB_PATH='(.+)/lib.*" "\\1" TCL_STUB_LIB_PATH ${line}) @@ -658,24 +656,22 @@ endif() IF(${line} MATCHES "TK_EXEC_PREFIX") IF(MSVC) - STRING(REGEX REPLACE ".*TK_EXEC_PREFIX='(.+)'.*" "\\1" TCL_WISH_EXECUTABLE ${line}) - IF (EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}.exe") - SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}.exe") - ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.exe") - SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.exe") - ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish.exe") - SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish.exe") - ENDIF() + SET(TK_EXE_SUFFIX ".exe") ELSE(MSVC) - STRING(REGEX REPLACE ".*TK_EXEC_PREFIX='(.+)'.*" "\\1" TCL_WISH_EXECUTABLE ${line}) - IF (EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}") - SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}") - ELSEIF (EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}") - SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}") - ELSEIF (EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish") - SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish") - ENDIF() + SET(TK_EXE_SUFFIX "") ENDIF(MSVC) + STRING(REGEX REPLACE ".*TK_EXEC_PREFIX='(.+)'.*" "\\1" TCL_WISH_EXECUTABLE ${line}) + IF (EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}") + ELSEIF(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish") + SET(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish") + ENDIF() endif() ENDFOREACH(line ${ENT}) IF(NOT TK_INCLUDE_PATH) @@ -813,190 +809,190 @@ # full path to the lib directory, catch that by adding the parent path # to the list to check IF(NOT TCL_FOUND) -IF(TCL_PREFIX) - SET(TCL_LIBRARY "NOTFOUND") - SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_PREFIX}/lib) - SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_PREFIX}) - GET_FILENAME_COMPONENT(TCL_LIB_PATH_PARENT "${TCL_PREFIX}" PATH) - SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_LIB_PATH_PARENT}/lib) - SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_LIB_PATH_PARENT}) - LIST(REMOVE_DUPLICATES TCL_PREFIX_LIBDIRS) - FIND_LIBRARY_VERSIONS(tcl TCL_PREFIX_LIBDIRS NO_SYSTEM_PATH) - SET(FOUND_FILES "${TCL_tcl_LIST}") - FIND_CONFIG_FILES(FOUND_FILES TCLCONFIG_LIST tclConfig.sh) - IF(TCL_REQUIRE_TK) - FIND_LIBRARY_VERSIONS(tk TCL_PREFIX_LIBDIRS NO_SYSTEM_PATH) - SET(FOUND_FILES "${TCL_tk_LIST}") - FIND_CONFIG_FILES(FOUND_FILES TKCONFIG_LIST tkConfig.sh) - ENDIF(TCL_REQUIRE_TK) -ELSE(TCL_PREFIX) - SET(TCLCONFIG_LIST "") - IF(APPLE) - INCLUDE(CMakeFindFrameworks) - CMAKE_FIND_FRAMEWORKS(Tcl) - FOREACH(dir ${Tcl_FRAMEWORKS}) - set(tclconf "tclConfig.sh-NOTFOUND") - find_file(tclconf tclConfig.sh PATHS ${dir}) - if(NOT tclconf MATCHES "NOTFOUND$") - SET(TCLCONFIG_LIST "${TCLCONFIG_LIST}${tclconf};") - endif(NOT tclconf MATCHES "NOTFOUND$") - ENDFOREACH(dir ${Tcl_FRAMEWORKS}) + IF(TCL_PREFIX) + SET(TCL_LIBRARY "NOTFOUND") + SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_PREFIX}/lib) + SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_PREFIX}) + GET_FILENAME_COMPONENT(TCL_LIB_PATH_PARENT "${TCL_PREFIX}" PATH) + SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_LIB_PATH_PARENT}/lib) + SET(TCL_PREFIX_LIBDIRS ${TCL_PREFIX_LIBDIRS} ${TCL_LIB_PATH_PARENT}) + LIST(REMOVE_DUPLICATES TCL_PREFIX_LIBDIRS) + FIND_LIBRARY_VERSIONS(tcl TCL_PREFIX_LIBDIRS NO_SYSTEM_PATH) + SET(FOUND_FILES "${TCL_tcl_LIST}") + FIND_CONFIG_FILES(FOUND_FILES TCLCONFIG_LIST tclConfig.sh) IF(TCL_REQUIRE_TK) - CMAKE_FIND_FRAMEWORKS(Tk) - FOREACH(dir ${Tk_FRAMEWORKS}) - set(tkconf "tkConfig.sh-NOTFOUND") - find_file(tkconf tkConfig.sh PATHS ${dir}) - if(NOT tkconf MATCHES "NOTFOUND$") - SET(TKCONFIG_LIST "${TKCONFIG_LIST}${tkconf};") - endif(NOT tkconf MATCHES "NOTFOUND$") - ENDFOREACH(dir ${Tk_FRAMEWORKS}) + FIND_LIBRARY_VERSIONS(tk TCL_PREFIX_LIBDIRS NO_SYSTEM_PATH) + SET(FOUND_FILES "${TCL_tk_LIST}") + FIND_CONFIG_FILES(FOUND_FILES TKCONFIG_LIST tkConfig.sh) ENDIF(TCL_REQUIRE_TK) - ENDIF(APPLE) - IF(NOT APPLE OR NOT TCL_USE_FRAMEWORK_ONLY) - SET(PATHLIST "$ENV{LD_LIBRARY_PATH}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DYLD_FALLBACK_LIBRARY_PATH}:$ENV{PATH}") - SET(PATHLIST "${TCL_ADDITIONAL_SEARCH_PATHS}:${PATHLIST}") - IF(WIN32) - WIN32TCLPATHS(PATHLIST "") - ENDIF(WIN32) - STRING(REGEX REPLACE "/s?bin:" ":" PATHLIST "${PATHLIST}") - STRING(REGEX REPLACE "/s?bin;" ":" PATHLIST "${PATHLIST}") - STRING(REGEX REPLACE "/lib6?4?:" ":" PATHLIST "${PATHLIST}") - STRING(REGEX REPLACE "/lib6?4?;" ":" PATHLIST "${PATHLIST}") - STRING(REGEX REPLACE ":" ";" PATHLIST "${PATHLIST}") - LIST(REMOVE_DUPLICATES PATHLIST) - FOREACH(foundpath ${PATHLIST}) - FOREACH(pattern ${TCL_PATH_NOMATCH_PATTERNS}) - if(foundpath MATCHES "${pattern}") - LIST(REMOVE_ITEM PATHLIST ${foundpath}) - endif(foundpath MATCHES "${pattern}") - ENDFOREACH(pattern ${TCL_PATH_NOMATCH_PATTERNS}) - ENDFOREACH() - SET(TCLPATHLIST "${PATHLIST}") - SET(TKPATHLIST "${PATHLIST}") - FIND_POSSIBLE_PATHS("tclsh" "tcl" TCLPATHLIST NO_SYSTEM_PATH) - IF(TCL_REQUIRE_TK) - FIND_POSSIBLE_PATHS("wish" "tk" TKPATHLIST NO_SYSTEM_PATH) - ENDIF(TCL_REQUIRE_TK) - # Hunt up tclConfig.sh files - FIND_CONFIG_FILES(TCLPATHLIST TCLCONFIG_LIST tclConfig.sh) - # Hunt up tkConfig.sh files - FIND_CONFIG_FILES(TKPATHLIST TKCONFIG_LIST tkConfig.sh) - ENDIF(NOT APPLE OR NOT TCL_USE_FRAMEWORK_ONLY) -ENDIF(TCL_PREFIX) -SET(TCLVALID 0) -RESET_TCL_VARS() -FOREACH(tcl_config_file ${TCLCONFIG_LIST}) - IF(NOT TCLVALID) - RESET_TCL_VARS() - READ_TCLCONFIG_FILE(${tcl_config_file}) - SET(TCLVALID 1) - SET(CURRENTTCLVERSION "${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.${TCL_VERSION_PATCH}") - VALIDATE_VERSION(TCLVALID ${CURRENTTCLVERSION}) - IF(TCLVALID) - GET_FILENAME_COMPONENT(TCL_CONF_PREFIX "${tcl_config_file}" PATH) - GET_FILENAME_COMPONENT(TCL_LIBRARY_DIR2 "${TCL_CONF_PREFIX}" PATH) - FIND_LIBRARY_PATHS(TCL_LIBRARY_SEARCH_PATHS TCL_PREFIX ${TCL_VERSION_MAJOR} ${TCL_VERSION_MINOR}) - SET(TCL_LIBRARY_SEARCH_PATHS "${TCL_CONF_PREFIX};${TCL_LIBRARY_DIR2};${TCL_LIBRARY_SEARCH_PATHS}") - FIND_LIBRARY(TCL_LIBRARY tcl Tcl tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR} tcl${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR} PATHS ${TCL_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) - FIND_LIBRARY(TCL_STUB_LIBRARY tclstub${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR} tclstub${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR} PATHS ${TCL_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) - ENDIF(TCLVALID) - VALIDATE_TCL(TCLVALID) - IF(TCLVALID) + ELSE(TCL_PREFIX) + SET(TCLCONFIG_LIST "") + IF(APPLE) + INCLUDE(CMakeFindFrameworks) + CMAKE_FIND_FRAMEWORKS(Tcl) + FOREACH(dir ${Tcl_FRAMEWORKS}) + set(tclconf "tclConfig.sh-NOTFOUND") + find_file(tclconf tclConfig.sh PATHS ${dir}) + if(NOT tclconf MATCHES "NOTFOUND$") + SET(TCLCONFIG_LIST "${TCLCONFIG_LIST}${tclconf};") + endif(NOT tclconf MATCHES "NOTFOUND$") + ENDFOREACH(dir ${Tcl_FRAMEWORKS}) IF(TCL_REQUIRE_TK) - SET(TKVALID 0) - FOREACH(tk_config_file ${TKCONFIG_LIST}) - IF(NOT TKVALID) - RESET_TK_VARS() - READ_TKCONFIG_FILE(${tk_config_file}) - SET(TKVALID 0) - SET(CURRENTTKVERSION "${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.${TK_VERSION_PATCH}") - SET(vtcltkcompare 0) - IF(${CURRENTTCLVERSION} VERSION_EQUAL ${CURRENTTKVERSION}) - SET(TKVALID 1) - ELSE() + CMAKE_FIND_FRAMEWORKS(Tk) + FOREACH(dir ${Tk_FRAMEWORKS}) + set(tkconf "tkConfig.sh-NOTFOUND") + find_file(tkconf tkConfig.sh PATHS ${dir}) + if(NOT tkconf MATCHES "NOTFOUND$") + SET(TKCONFIG_LIST "${TKCONFIG_LIST}${tkconf};") + endif(NOT tkconf MATCHES "NOTFOUND$") + ENDFOREACH(dir ${Tk_FRAMEWORKS}) + ENDIF(TCL_REQUIRE_TK) + ENDIF(APPLE) + IF(NOT APPLE OR NOT TCL_USE_FRAMEWORK_ONLY) + SET(PATHLIST "$ENV{LD_LIBRARY_PATH}:$ENV{DYLD_LIBRARY_PATH}:$ENV{DYLD_FALLBACK_LIBRARY_PATH}:$ENV{PATH}") + SET(PATHLIST "${TCL_ADDITIONAL_SEARCH_PATHS}:${PATHLIST}") + IF(WIN32) + WIN32TCLPATHS(PATHLIST "") + ENDIF(WIN32) + STRING(REGEX REPLACE "/s?bin:" ":" PATHLIST "${PATHLIST}") + STRING(REGEX REPLACE "/s?bin;" ":" PATHLIST "${PATHLIST}") + STRING(REGEX REPLACE "/lib6?4?:" ":" PATHLIST "${PATHLIST}") + STRING(REGEX REPLACE "/lib6?4?;" ":" PATHLIST "${PATHLIST}") + STRING(REGEX REPLACE ":" ";" PATHLIST "${PATHLIST}") + LIST(REMOVE_DUPLICATES PATHLIST) + FOREACH(foundpath ${PATHLIST}) + FOREACH(pattern ${TCL_PATH_NOMATCH_PATTERNS}) + if(foundpath MATCHES "${pattern}") + LIST(REMOVE_ITEM PATHLIST ${foundpath}) + endif(foundpath MATCHES "${pattern}") + ENDFOREACH(pattern ${TCL_PATH_NOMATCH_PATTERNS}) + ENDFOREACH() + SET(TCLPATHLIST "${PATHLIST}") + SET(TKPATHLIST "${PATHLIST}") + FIND_POSSIBLE_PATHS("tclsh" "tcl" TCLPATHLIST NO_SYSTEM_PATH) + IF(TCL_REQUIRE_TK) + FIND_POSSIBLE_PATHS("wish" "tk" TKPATHLIST NO_SYSTEM_PATH) + ENDIF(TCL_REQUIRE_TK) + # Hunt up tclConfig.sh files + FIND_CONFIG_FILES(TCLPATHLIST TCLCONFIG_LIST tclConfig.sh) + # Hunt up tkConfig.sh files + FIND_CONFIG_FILES(TKPATHLIST TKCONFIG_LIST tkConfig.sh) + ENDIF(NOT APPLE OR NOT TCL_USE_FRAMEWORK_ONLY) + ENDIF(TCL_PREFIX) + SET(TCLVALID 0) + RESET_TCL_VARS() + FOREACH(tcl_config_file ${TCLCONFIG_LIST}) + IF(NOT TCLVALID) + RESET_TCL_VARS() + READ_TCLCONFIG_FILE(${tcl_config_file}) + SET(TCLVALID 1) + SET(CURRENTTCLVERSION "${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.${TCL_VERSION_PATCH}") + VALIDATE_VERSION(TCLVALID ${CURRENTTCLVERSION}) + IF(TCLVALID) + GET_FILENAME_COMPONENT(TCL_CONF_PREFIX "${tcl_config_file}" PATH) + GET_FILENAME_COMPONENT(TCL_LIBRARY_DIR2 "${TCL_CONF_PREFIX}" PATH) + FIND_LIBRARY_PATHS(TCL_LIBRARY_SEARCH_PATHS TCL_PREFIX ${TCL_VERSION_MAJOR} ${TCL_VERSION_MINOR}) + SET(TCL_LIBRARY_SEARCH_PATHS "${TCL_CONF_PREFIX};${TCL_LIBRARY_DIR2};${TCL_LIBRARY_SEARCH_PATHS}") + FIND_LIBRARY(TCL_LIBRARY tcl Tcl tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR} tcl${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR} PATHS ${TCL_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) + FIND_LIBRARY(TCL_STUB_LIBRARY tclstub${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR} tclstub${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR} PATHS ${TCL_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) + ENDIF(TCLVALID) + VALIDATE_TCL(TCLVALID) + IF(TCLVALID) + IF(TCL_REQUIRE_TK) + SET(TKVALID 0) + FOREACH(tk_config_file ${TKCONFIG_LIST}) + IF(NOT TKVALID) + RESET_TK_VARS() + READ_TKCONFIG_FILE(${tk_config_file}) SET(TKVALID 0) - ENDIF() - IF(TKVALID) - GET_FILENAME_COMPONENT(TCL_TK_CONF_PREFIX "${tk_config_file}" PATH) - GET_FILENAME_COMPONENT(TCL_TK_LIBRARY_DIR2 "${TCL_TK_CONF_PREFIX}" PATH) - FIND_LIBRARY_PATHS(TCL_TK_LIBRARY_SEARCH_PATHS TK_PREFIX ${TK_VERSION_MAJOR} ${TK_VERSION_MINOR}) - SET(TCL_TK_LIBRARY_SEARCH_PATHS "${TCL_TK_CONF_PREFIX};${TCL_TK_LIBRARY_DIR2};${TCL_TK_LIBRARY_SEARCH_PATHS}") - FIND_LIBRARY(TCL_TK_LIBRARY tk Tk tk${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} tk${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TCL_TK_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) - FIND_LIBRARY(TCL_TK_STUB_LIBRARY tkstub tkstub${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} tkstub${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TCL_TK_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) - VALIDATE_TK(TKVALID) - ENDIF(TKVALID) + SET(CURRENTTKVERSION "${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.${TK_VERSION_PATCH}") + SET(vtcltkcompare 0) + IF(${CURRENTTCLVERSION} VERSION_EQUAL ${CURRENTTKVERSION}) + SET(TKVALID 1) + ELSE() + SET(TKVALID 0) + ENDIF() + IF(TKVALID) + GET_FILENAME_COMPONENT(TCL_TK_CONF_PREFIX "${tk_config_file}" PATH) + GET_FILENAME_COMPONENT(TCL_TK_LIBRARY_DIR2 "${TCL_TK_CONF_PREFIX}" PATH) + FIND_LIBRARY_PATHS(TCL_TK_LIBRARY_SEARCH_PATHS TK_PREFIX ${TK_VERSION_MAJOR} ${TK_VERSION_MINOR}) + SET(TCL_TK_LIBRARY_SEARCH_PATHS "${TCL_TK_CONF_PREFIX};${TCL_TK_LIBRARY_DIR2};${TCL_TK_LIBRARY_SEARCH_PATHS}") + FIND_LIBRARY(TCL_TK_LIBRARY tk Tk tk${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} tk${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TCL_TK_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) + FIND_LIBRARY(TCL_TK_STUB_LIBRARY tkstub tkstub${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} tkstub${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TCL_TK_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH) + VALIDATE_TK(TKVALID) + ENDIF(TKVALID) + ENDIF(NOT TKVALID) + ENDFOREACH(tk_config_file ${TKCONFIG_LIST}) + IF(NOT TKVALID) + SET(TCLVALID 0) ENDIF(NOT TKVALID) - ENDFOREACH(tk_config_file ${TKCONFIG_LIST}) - IF(NOT TKVALID) - SET(TCLVALID 0) - ENDIF(NOT TKVALID) - ENDIF(TCL_REQUIRE_TK) - ENDIF(TCLVALID) - ENDIF(NOT TCLVALID) -ENDFOREACH(tcl_config_file ${TCLCONFIG_LIST}) + ENDIF(TCL_REQUIRE_TK) + ENDIF(TCLVALID) + ENDIF(NOT TCLVALID) + ENDFOREACH(tcl_config_file ${TCLCONFIG_LIST}) -# If we still don't have anything by now, we may have a system without tclConfig.sh and tkConfig.sh -# Back to trying to guess values, using the TCLPATHLIST and TKPATHLIST arrays of paths. This is -# attempted ONLY if we are looking for a Tcl/Tk installation to call as a scripting engine and not -# as C libraries to build against - the autotools/TEA based Tcl/Tk world requires those files be -# present and any ExternalProject build attempting to use a Tcl/Tk installation without them would -# not succeed. -IF(NOT TCLVALID AND NOT TCL_NEED_HEADERS) - SET(PATHLIST "${TCLPATHLIST};${TKPATHLIST}") - LIST(REMOVE_DUPLICATES PATHLIST) - FOREACH(MAJORNUM ${TCL_POSSIBLE_MAJOR_VERSIONS}) - FOREACH(MINORNUM ${TCL_POSSIBLE_MINOR_VERSIONS}) - FOREACH(SPATH ${PATHLIST}) - IF(NOT TCLVALID) - RESET_TCL_VARS() - SET(CURRENT_SEARCH_VERSION "${MAJORNUM}.${MINORNUM}") - VALIDATE_VERSION(dosearch ${CURRENT_SEARCH_VERSION}) - IF(dosearch) - FIND_LIBRARY_PATHS(TCL_LIBRARY_SEARCH_PATHS SPATH ${MAJORNUM} ${MINORNUM}) - FIND_PROGRAM_PATHS(TCL_PROGRAM_SEARCH_PATHS SPATH ${MAJORNUM} ${MINORNUM}) - FIND_PROGRAM(TCL_TCLSH_EXECUTABLE NAMES tclsh${MAJORNUM}.${MINORNUM} tclsh${MAJORNUM}${MINORNUM} PATHS ${TCL_PROGRAM_SEARCH_PATHS} NO_SYSTEM_PATH) - ENDIF(dosearch) - VALIDATE_TCL(TCLVALID) - IF(TCLVALID) - IF(TCL_REQUIRE_TK) - SET(TKVALID 0) - RESET_TK_VARS() - FIND_PROGRAM(TCL_WISH_EXECUTABLE NAMES wish${MAJORNUM}.${MINORNUM} wish${MAJORNUM}${MINORNUM} PATHS ${TCL_PROGRAM_SEARCH_PATHS} NO_SYSTEM_PATH) - VALIDATE_TK(TKVALID) - IF(NOT TKVALID) - SET(TCLVALID 0) - RESET_TCL_VARS() - RESET_TK_VARS() - ENDIF(NOT TKVALID) - ENDIF(TCL_REQUIRE_TK) - ELSE(TCLVALID) + # If we still don't have anything by now, we may have a system without tclConfig.sh and tkConfig.sh + # Back to trying to guess values, using the TCLPATHLIST and TKPATHLIST arrays of paths. This is + # attempted ONLY if we are looking for a Tcl/Tk installation to call as a scripting engine and not + # as C libraries to build against - the autotools/TEA based Tcl/Tk world requires those files be + # present and any ExternalProject build attempting to use a Tcl/Tk installation without them would + # not succeed. + IF(NOT TCLVALID AND NOT TCL_NEED_HEADERS) + SET(PATHLIST "${TCLPATHLIST};${TKPATHLIST}") + LIST(REMOVE_DUPLICATES PATHLIST) + FOREACH(MAJORNUM ${TCL_POSSIBLE_MAJOR_VERSIONS}) + FOREACH(MINORNUM ${TCL_POSSIBLE_MINOR_VERSIONS}) + FOREACH(SPATH ${PATHLIST}) + IF(NOT TCLVALID) RESET_TCL_VARS() - ENDIF(TCLVALID) - ENDIF(NOT TCLVALID) - ENDFOREACH(SPATH ${PATHLIST}) + SET(CURRENT_SEARCH_VERSION "${MAJORNUM}.${MINORNUM}") + VALIDATE_VERSION(dosearch ${CURRENT_SEARCH_VERSION}) + IF(dosearch) + FIND_LIBRARY_PATHS(TCL_LIBRARY_SEARCH_PATHS SPATH ${MAJORNUM} ${MINORNUM}) + FIND_PROGRAM_PATHS(TCL_PROGRAM_SEARCH_PATHS SPATH ${MAJORNUM} ${MINORNUM}) + FIND_PROGRAM(TCL_TCLSH_EXECUTABLE NAMES tclsh${MAJORNUM}.${MINORNUM} tclsh${MAJORNUM}${MINORNUM} PATHS ${TCL_PROGRAM_SEARCH_PATHS} NO_SYSTEM_PATH) + ENDIF(dosearch) + VALIDATE_TCL(TCLVALID) + IF(TCLVALID) + IF(TCL_REQUIRE_TK) + SET(TKVALID 0) + RESET_TK_VARS() + FIND_PROGRAM(TCL_WISH_EXECUTABLE NAMES wish${MAJORNUM}.${MINORNUM} wish${MAJORNUM}${MINORNUM} PATHS ${TCL_PROGRAM_SEARCH_PATHS} NO_SYSTEM_PATH) + VALIDATE_TK(TKVALID) + IF(NOT TKVALID) + SET(TCLVALID 0) + RESET_TCL_VARS() + RESET_TK_VARS() + ENDIF(NOT TKVALID) + ENDIF(TCL_REQUIRE_TK) + ELSE(TCLVALID) + RESET_TCL_VARS() + ENDIF(TCLVALID) + ENDIF(NOT TCLVALID) + ENDFOREACH(SPATH ${PATHLIST}) + ENDFOREACH() ENDFOREACH() - ENDFOREACH() -ENDIF(NOT TCLVALID AND NOT TCL_NEED_HEADERS) + ENDIF(NOT TCLVALID AND NOT TCL_NEED_HEADERS) -# By this point we have found everything we're going to find - set variables to be exposed as results -SET(TCL_TCLSH ${TCL_TCLSH_EXECUTABLE}) -SET(TK_WISH ${TCL_WISH_EXECUTABLE}) -SET(TK_LIBRARY ${TCL_TK_LIBRARY}) # Deprecated -SET(TK_STUB_LIBRARY ${TCL_TK_STUB_LIBRARY}) -SET(TCL_INCLUDE_DIRS ${TCL_INCLUDE_PATH} ${TK_INCLUDE_PATH} ${TCL_INCLUDE_PATH}/../generic) -SET(TCL_LIBRARIES ${TCL_LIBRARY} ${TK_LIBRARY}) -SET(TCL_STUB_LIBRARIES ${TCL_STUB_LIBRARY} ${TK_STUB_LIBRARY}) -SET(TCL_ROOT_PATH ${TCL_CONF_PREFIX}) -SET(TCL_VERSION_STRING "${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.${TCL_VERSION_PATCH}") -FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL DEFAULT_MSG TCL_LIBRARY ${PACKAGE_HANDLE_VARS}) -IF(TCL_REQUIRE_TK) - SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS};TCL_LIBRARY") - FIND_PACKAGE_HANDLE_STANDARD_ARGS(TK DEFAULT_MSG TCL_TK_LIBRARY ${PACKAGE_HANDLE_VARS}) -ENDIF(TCL_REQUIRE_TK) + # By this point we have found everything we're going to find - set variables to be exposed as results + SET(TCL_TCLSH ${TCL_TCLSH_EXECUTABLE}) + SET(TK_WISH ${TCL_WISH_EXECUTABLE}) + SET(TK_LIBRARY ${TCL_TK_LIBRARY}) # Deprecated + SET(TK_STUB_LIBRARY ${TCL_TK_STUB_LIBRARY}) + SET(TCL_INCLUDE_DIRS ${TCL_INCLUDE_PATH} ${TK_INCLUDE_PATH} ${TCL_INCLUDE_PATH}/../generic) + SET(TCL_LIBRARIES ${TCL_LIBRARY} ${TK_LIBRARY}) + SET(TCL_STUB_LIBRARIES ${TCL_STUB_LIBRARY} ${TK_STUB_LIBRARY}) + SET(TCL_ROOT_PATH ${TCL_CONF_PREFIX}) + SET(TCL_VERSION_STRING "${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.${TCL_VERSION_PATCH}") + FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL DEFAULT_MSG TCL_LIBRARY ${PACKAGE_HANDLE_VARS}) + IF(TCL_REQUIRE_TK) + SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS};TCL_LIBRARY") + FIND_PACKAGE_HANDLE_STANDARD_ARGS(TK DEFAULT_MSG TCL_TK_LIBRARY ${PACKAGE_HANDLE_VARS}) + ENDIF(TCL_REQUIRE_TK) -FOREACH(pkgvar ${PACKAGE_HANDLE_VARS}) - SET(${pkgvar} ${${pkgvar}} CACHE STRING "set by FindTCL" FORCE) -ENDFOREACH(pkgvar ${PACKAGE_HANDLE_VARS}) + FOREACH(pkgvar ${PACKAGE_HANDLE_VARS}) + SET(${pkgvar} ${${pkgvar}} CACHE STRING "set by FindTCL" FORCE) + ENDFOREACH(pkgvar ${PACKAGE_HANDLE_VARS}) ENDIF(NOT TCL_FOUND) @@ -1036,5 +1032,5 @@ conffile USE_TCL_STUBS USE_TK_STUBS -) + ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |