Revision: 41811
http://brlcad.svn.sourceforge.net/brlcad/?rev=41811&view=rev
Author: starseeker
Date: 2010-12-28 15:24:58 +0000 (Tue, 28 Dec 2010)
Log Message:
-----------
Rename TCL_TCLSH and TK_WISH to conform, couple other renamings - some logic
reworking to do here when it comes to TCL_FOUND and marking advanced.
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/FindTCL.cmake
Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-12-28 15:15:09 UTC
(rev 41810)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-12-28 15:24:58 UTC
(rev 41811)
@@ -523,7 +523,7 @@
SET(TCL_INCLUDE_PATH "NOTFOUND")
SET(TCL_LIBRARY "NOTFOUND")
SET(TCL_STUB_LIBRARY "NOTFOUND")
- SET(TCL_TCLSH "NOTFOUND")
+ SET(TCL_TCLSH_EXECUTABLE "NOTFOUND")
ENDMACRO()
MACRO(RESET_TK_VARS)
@@ -531,9 +531,9 @@
SET(TK_VERSION_MINOR "NOTFOUND")
SET(TK_VERSION_PATCH "NOTFOUND")
SET(TK_INCLUDE_PATH "NOTFOUND")
- SET(TK_LIBRARY "NOTFOUND")
- SET(TK_STUB_LIBRARY "NOTFOUND")
- SET(TK_WISH "NOTFOUND")
+ SET(TCL_TK_LIBRARY "NOTFOUND")
+ SET(TCL_TK_STUB_LIBRARY "NOTFOUND")
+ SET(TCL_WISH_EXECUTABLE "NOTFOUND")
ENDMACRO()
MACRO(VALIDATE_TCL_VARIABLES validvar)
@@ -546,9 +546,9 @@
IF(NOT TCL_STUB_LIBRARY AND TCL_NEED_STUB_LIBS AND TCL_NEED_HEADERS)
SET(${validvar} 0)
ENDIF(NOT TCL_STUB_LIBRARY AND TCL_NEED_STUB_LIBS AND TCL_NEED_HEADERS)
- IF(NOT TCL_TCLSH)
+ IF(NOT TCL_TCLSH_EXECUTABLE)
SET(${validvar} 0)
- ENDIF(NOT TCL_TCLSH)
+ ENDIF(NOT TCL_TCLSH_EXECUTABLE)
ENDMACRO(VALIDATE_TCL_VARIABLES)
@@ -556,15 +556,15 @@
IF(NOT TK_INCLUDE_PATH AND TCL_NEED_HEADERS)
SET(${validvar} 0)
ENDIF(NOT TK_INCLUDE_PATH AND TCL_NEED_HEADERS)
- IF(NOT TK_LIBRARY AND TCL_NEED_HEADERS)
+ IF(NOT TCL_TK_LIBRARY AND TCL_NEED_HEADERS)
SET(${validvar} 0)
- ENDIF(NOT TK_LIBRARY AND TCL_NEED_HEADERS)
- IF(NOT TK_STUB_LIBRARY AND TCL_NEED_STUB_LIBS AND TCL_NEED_HEADERS)
+ ENDIF(NOT TCL_TK_LIBRARY AND TCL_NEED_HEADERS)
+ IF(NOT TCL_TK_STUB_LIBRARY AND TCL_NEED_STUB_LIBS AND TCL_NEED_HEADERS)
SET(${validvar} 0)
- ENDIF(NOT TK_STUB_LIBRARY AND TCL_NEED_STUB_LIBS AND TCL_NEED_HEADERS)
- IF(NOT TK_WISH)
+ ENDIF(NOT TCL_TK_STUB_LIBRARY AND TCL_NEED_STUB_LIBS AND
TCL_NEED_HEADERS)
+ IF(NOT TCL_WISH_EXECUTABLE)
SET(${validvar} 0)
- ENDIF(NOT TK_WISH)
+ ENDIF(NOT TCL_WISH_EXECUTABLE)
ENDMACRO(VALIDATE_TK_VARIABLES)
@@ -598,21 +598,21 @@
endif()
IF(${line} MATCHES "TCL_EXEC_PREFIX")
IF(MSVC)
- STRING(REGEX REPLACE
".*TCL_EXEC_PREFIX='(.+)'.*" "\\1" TCL_TCLSH ${line})
- IF (EXISTS
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}.exe")
- SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}.exe")
+ 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")
ELSE()
- IF (EXISTS
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.exe")
- SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.exe")
+ 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")
ENDIF()
ENDIF()
ELSE(MSVC)
- STRING(REGEX REPLACE
".*TCL_EXEC_PREFIX='(.+)'.*" "\\1" TCL_TCLSH ${line})
- IF (EXISTS
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}")
- SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}")
+ 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}")
ELSE()
- IF (EXISTS
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
- SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
+ 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}")
ENDIF()
ENDIF()
ENDIF(MSVC)
@@ -650,21 +650,21 @@
endif()
IF(${line} MATCHES "TK_EXEC_PREFIX")
IF(MSVC)
- STRING(REGEX REPLACE
".*TK_EXEC_PREFIX='(.+)'.*" "\\1" TK_WISH ${line})
- IF (EXISTS
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}.exe")
- SET(TK_WISH
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}.exe")
+ 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")
ELSE()
- IF (EXISTS
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.exe")
- SET(TK_WISH
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.exe")
+ 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")
ENDIF()
ENDIF()
ELSE(MSVC)
- STRING(REGEX REPLACE
".*TK_EXEC_PREFIX='(.+)'.*" "\\1" TK_WISH ${line})
- IF (EXISTS
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}")
- SET(TK_WISH
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}")
+ 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}")
ELSE()
- IF (EXISTS
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}")
- SET(TK_WISH
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}")
+ 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}")
ENDIF()
ENDIF()
ENDIF(MSVC)
@@ -685,26 +685,26 @@
MACRO(VALIDATE_TCL validvar)
SET(${validvar} 1)
VALIDATE_TCL_VARIABLES(${validvar})
- IF(TCL_TCLSH)
- TCL_GET_VERSION(${TCL_TCLSH} CURRENT_SEARCH_VERSION)
+ IF(TCL_TCLSH_EXECUTABLE)
+ TCL_GET_VERSION(${TCL_TCLSH_EXECUTABLE} CURRENT_SEARCH_VERSION)
VALIDATE_VERSION(dosearch ${CURRENT_SEARCH_VERSION})
IF(NOT dosearch)
SET(${validvar} 0)
ENDIF(NOT dosearch)
- ENDIF(TCL_TCLSH)
- IF(TCL_REQUIRE_THREADS AND TCL_TCLSH)
- TCL_ISTHREADED(${TCL_TCLSH} TCL_THREADS)
+ ENDIF(TCL_TCLSH_EXECUTABLE)
+ IF(TCL_REQUIRE_THREADS AND TCL_TCLSH_EXECUTABLE)
+ TCL_ISTHREADED(${TCL_TCLSH_EXECUTABLE} TCL_THREADS)
IF(NOT TCL_THREADS)
SET(${validvar} 0)
ENDIF(NOT TCL_THREADS)
- ENDIF(TCL_REQUIRE_THREADS AND TCL_TCLSH)
+ ENDIF(TCL_REQUIRE_THREADS AND TCL_TCLSH_EXECUTABLE)
ENDMACRO(VALIDATE_TCL)
MACRO(VALIDATE_TK validvar)
SET(${validvar} 1)
VALIDATE_TK_VARIABLES(${validvar})
IF(TK_NATIVE_GRAPHICS OR TK_X11_GRAPHICS)
- TK_GRAPHICS_SYSTEM(${TK_WISH} TK_SYSTEM_GRAPHICS)
+ TK_GRAPHICS_SYSTEM(${TCL_WISH_EXECUTABLE} TK_SYSTEM_GRAPHICS)
IF(APPLE AND TK_NATIVE_GRAPHICS)
IF(NOT ${TK_SYSTEM_GRAPHICS} MATCHES "aqua")
SET(${validvar} 0)
@@ -870,11 +870,11 @@
ENDIF()
IF(TKVALID)
GET_FILENAME_COMPONENT(TK_CONF_PREFIX "${tk_config_file}" PATH)
-
GET_FILENAME_COMPONENT(TK_LIBRARY_DIR2 "${TK_CONF_PREFIX}" PATH)
-
FIND_LIBRARY_PATHS(TK_LIBRARY_SEARCH_PATHS TK_PREFIX ${TK_VERSION_MAJOR}
${TK_VERSION_MINOR})
-
SET(TK_LIBRARY_SEARCH_PATHS
"${TK_CONF_PREFIX};${TK_LIBRARY_DIR2};${TK_LIBRARY_SEARCH_PATHS}")
- FIND_LIBRARY(TK_LIBRARY
tk Tk tk${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}
tk${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TK_LIBRARY_SEARCH_PATHS}
NO_SYSTEM_PATH)
-
FIND_LIBRARY(TK_STUB_LIBRARY tkstub
tkstub${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}
tkstub${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TK_LIBRARY_SEARCH_PATHS}
NO_SYSTEM_PATH)
+
GET_FILENAME_COMPONENT(TCL_TK_LIBRARY_DIR2 "${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
"${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)
@@ -906,14 +906,14 @@
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 NAMES
tclsh${MAJORNUM}.${MINORNUM} tclsh${MAJORNUM}${MINORNUM} PATHS
${TCL_PROGRAM_SEARCH_PATHS} NO_SYSTEM_PATH)
+
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(TK_WISH
NAMES wish${MAJORNUM}.${MINORNUM} wish${MAJORNUM}${MINORNUM} PATHS
${TCL_PROGRAM_SEARCH_PATHS} NO_SYSTEM_PATH)
+
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)
@@ -930,10 +930,13 @@
ENDFOREACH()
ENDIF(NOT TCLVALID AND NOT TCL_NEED_HEADERS)
+# Translate interal search results into variables to be exposed as results
+# FIXME - todo
+
# Set TCL_FOUND to TRUE if all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
-SET(PACKAGE_HANDLE_VARS "TCL_TCLSH")
+SET(PACKAGE_HANDLE_VARS "TCL_TCLSH_EXECUTABLE")
IF(TCL_NEED_HEADERS)
SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TCL_INCLUDE_PATH
TCL_CONF_PREFIX")
IF(TCL_NEED_STUB_LIBS)
@@ -941,14 +944,14 @@
ENDIF(TCL_NEED_STUB_LIBS)
IF(TCL_REQUIRE_TK)
- SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TK_INCLUDE_PATH
TK_CONF_PREFIX TK_LIBRARY TK_WISH")
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TK_INCLUDE_PATH
TK_CONF_PREFIX TCL_TK_LIBRARY TCL_WISH_EXECUTABLE")
IF(TCL_NEED_STUB_LIBS)
- SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}
TK_STUB_LIBRARY")
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}
TCL_TK_STUB_LIBRARY")
ENDIF(TCL_NEED_STUB_LIBS)
ENDIF(TCL_REQUIRE_TK)
ELSE(TCL_NEED_HEADERS)
IF(TCL_REQUIRE_TK)
- SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TK_WISH")
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}
TCL_WISH_EXECUTABLE")
ENDIF(TCL_REQUIRE_TK)
ENDIF(TCL_NEED_HEADERS)
STRING(REGEX REPLACE " " ";" PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}")
@@ -962,17 +965,16 @@
ENDFOREACH(tclvar ${PACKAGE_HANDLE_VARS})
IF(TCL_REQUIRE_TK)
SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS};TCL_LIBRARY")
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(TK DEFAULT_MSG TK_LIBRARY
${PACKAGE_HANDLE_VARS})
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(TK DEFAULT_MSG TCL_TK_LIBRARY
${PACKAGE_HANDLE_VARS})
ENDIF(TCL_REQUIRE_TK)
MARK_AS_ADVANCED(
- TCL_INCLUDE_PATH
- TK_INCLUDE_PATH
+ TCL_INCLUDE_DIRS
TCL_LIBRARY
- TK_LIBRARY
+ TCL_TK_LIBRARY
TCL_STUB_LIBRARY
- TK_STUB_LIBRARY
- TCL_TCLSH
- TK_WISH
+ TCL_TK_STUB_LIBRARY
+ TCL_TCLSH_EXECUTABLE
+ TCL_WISH_EXECUTABLE
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
