Revision: 41853
http://brlcad.svn.sourceforge.net/brlcad/?rev=41853&view=rev
Author: starseeker
Date: 2010-12-30 15:57:57 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
Try to handle additional variables for TCL results.
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-30 15:55:45 UTC
(rev 41852)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-12-30 15:57:57 UTC
(rev 41853)
@@ -869,10 +869,10 @@
SET(TKVALID 0)
ENDIF()
IF(TKVALID)
-
GET_FILENAME_COMPONENT(TK_CONF_PREFIX "${tk_config_file}" PATH)
-
GET_FILENAME_COMPONENT(TCL_TK_LIBRARY_DIR2 "${TK_CONF_PREFIX}" PATH)
+
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
"${TK_CONF_PREFIX};${TCL_TK_LIBRARY_DIR2};${TCL_TK_LIBRARY_SEARCH_PATHS}")
+
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)
@@ -930,21 +930,25 @@
ENDFOREACH()
ENDIF(NOT TCLVALID AND NOT TCL_NEED_HEADERS)
-# Translate interal search results into variables to be exposed as results
+# By this point we have found everything we're going to find - set variables
to be exposed as results
-# FIXME - todo
+SET(TCL_INCLUDE_DIRS ${TCL_INCLUDE_PATH} ${TK_INCLUDE_PATH})
+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}")
# Set TCL_FOUND to TRUE if all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
SET(PACKAGE_HANDLE_VARS "TCL_TCLSH_EXECUTABLE")
IF(TCL_NEED_HEADERS)
- SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TCL_INCLUDE_PATH
TCL_CONF_PREFIX")
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TCL_LIBRARIES
TCL_INCLUDE_DIRS TCL_CONF_PREFIX")
IF(TCL_NEED_STUB_LIBS)
- SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}
TCL_STUB_LIBRARY")
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}
TCL_STUB_LIBRARIES")
ENDIF(TCL_NEED_STUB_LIBS)
IF(TCL_REQUIRE_TK)
- SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TK_INCLUDE_PATH
TK_CONF_PREFIX TCL_TK_LIBRARY TCL_WISH_EXECUTABLE")
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TK_INCLUDE_PATH
TCL_TK_CONF_PREFIX TCL_TK_LIBRARY TCL_WISH_EXECUTABLE")
IF(TCL_NEED_STUB_LIBS)
SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}
TCL_TK_STUB_LIBRARY")
ENDIF(TCL_NEED_STUB_LIBS)
@@ -968,13 +972,29 @@
FIND_PACKAGE_HANDLE_STANDARD_ARGS(TK DEFAULT_MSG TCL_TK_LIBRARY
${PACKAGE_HANDLE_VARS})
ENDIF(TCL_REQUIRE_TK)
+# Set deprecated variables for compatibility
+SET(TK_LIBRARY ${TCL_TK_LIBRARY})
+SET(TK_STUB_LIBRARY ${TCL_TK_STUB_LIBRARY})
+SET(TCL_TCLSH ${TCL_TCLSH_EXECUTABLE})
+SET(TK_WISH ${TCL_WISH_EXECUTABLE})
+
MARK_AS_ADVANCED(
TCL_INCLUDE_DIRS
+ TCL_INCLUDE_PATH
+ TK_INCLUDE_PATH
+ TCL_LIBRARIES
TCL_LIBRARY
TCL_TK_LIBRARY
+ TK_LIBRARY
+ TCL_STUB_LIBRARIES
TCL_STUB_LIBRARY
TCL_TK_STUB_LIBRARY
+ TK_STUB_LIBRARY
TCL_TCLSH_EXECUTABLE
+ TCL_TCLSH
TCL_WISH_EXECUTABLE
+ TK_WISH
+ TCL_CONF_PREFIX
+ TCL_TK_CONF_PREFIX
)
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
