Revision: 42124
http://brlcad.svn.sourceforge.net/brlcad/?rev=42124&view=rev
Author: starseeker
Date: 2011-01-12 03:12:37 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Add the deprecated Tcl/Tk vars into the handle-standard-args logic - they
apparently aren't visible to other projects otherwise.
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/FindTCL.cmake
Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2011-01-12 02:57:49 UTC
(rev 42123)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2011-01-12 03:12:37 UTC
(rev 42124)
@@ -944,21 +944,29 @@
# Set TCL_FOUND to TRUE if all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
SET(PACKAGE_HANDLE_VARS "TCL_TCLSH_EXECUTABLE")
+SET(TCL_TCLSH ${TCL_TCLSH_EXECUTABLE}) #Deprecated
+SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TCL_TCLSH")
IF(TCL_NEED_HEADERS)
- SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TCL_LIBRARIES
TCL_INCLUDE_DIRS TCL_CONF_PREFIX")
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TCL_LIBRARIES
TCL_INCLUDE_DIRS TCL_CONF_PREFIX TCL_LIBRARY")
IF(TCL_NEED_STUB_LIBS)
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
TCL_TK_CONF_PREFIX TCL_TK_LIBRARY TCL_WISH_EXECUTABLE")
+ SET(TK_LIBRARY ${TCL_TK_LIBRARY}) # Deprecated
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TK_LIBRARY")
IF(TCL_NEED_STUB_LIBS)
SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}
TCL_TK_STUB_LIBRARY")
+ SET(TK_STUB_LIBRARY ${TCL_TK_STUB_LIBRARY}) #Deprecated
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}
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}
TCL_WISH_EXECUTABLE")
+ SET(TK_WISH ${TCL_WISH_EXECUTABLE}) #Deprecated
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TK_WISH")
ENDIF(TCL_REQUIRE_TK)
ENDIF(TCL_NEED_HEADERS)
STRING(REGEX REPLACE " " ";" PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}")
@@ -975,12 +983,6 @@
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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
