Revision: 40593
http://brlcad.svn.sourceforge.net/brlcad/?rev=40593&view=rev
Author: starseeker
Date: 2010-09-17 03:42:25 +0000 (Fri, 17 Sep 2010)
Log Message:
-----------
Switch the flags to the new name...
Modified Paths:
--------------
brlcad/branches/cmake/src/other/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-09-17 02:52:37 UTC
(rev 40592)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-09-17 03:42:25 UTC
(rev 40593)
@@ -92,23 +92,23 @@
OPTION(BRLCAD_BUILD_LOCAL_TK "Build the local versions of Tcl/Tk" OFF)
SET(BRLCAD_BUILD_LOCAL_TK OFF CACHE STRING "local tk build" FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_TCL AND TCL_REQUIRE_TK)
-IF(BRLCAD_BUILD_LOCAL_LIBS)
+IF(BRLCAD-ENABLE_ALL_LOCAL_LIBS)
OPTION(BRLCAD_BUILD_LOCAL_TK "Build the local versions of Tcl/Tk" ON)
SET(BRLCAD_BUILD_LOCAL_TK ON CACHE STRING "local tk build" FORCE)
-ENDIF(BRLCAD_BUILD_LOCAL_LIBS)
+ENDIF(BRLCAD-ENABLE_ALL_LOCAL_LIBS)
THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(TCL tcl src/other/tcl unix "")
-IF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD_BUILD_LOCAL_LIBS)
+IF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
SET(TCL_LIBRARY
"${BRLCAD_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tcl8.5${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "TCL_LIBRARY" FORCE)
SET(TCL_INCLUDE_PATH "${BRLCAD_PREFIX}/include" CACHE STRING
"TCL_INCLUDE_PATH" FORCE)
SET(TCL_CONF_PREFIX "${BRLCAD_PREFIX}/lib" CACHE STRING
"TCL_CONF_PREFIX" FORCE)
-ENDIF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD_BUILD_LOCAL_LIBS)
+ENDIF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(TK tk src/other/tk unix
"--with-tcl=${TCL_CONF_PREFIX}")
-IF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD_BUILD_LOCAL_LIBS)
+IF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
SET(TK_LIBRARY
"${BRLCAD_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tk8.5${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "TK_LIBRARY" FORCE)
SET(TK_INCLUDE_PATH "${BRLCAD_PREFIX}/include" CACHE STRING
"TK_INCLUDE_PATH" FORCE)
SET(TK_CONF_PREFIX "${BRLCAD_PREFIX}/lib" CACHE STRING "TK_CONF_PREFIX"
FORCE)
ADD_DEPENDENCIES(tk tcl)
-ENDIF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD_BUILD_LOCAL_LIBS)
+ENDIF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
# Now that Tcl/Tk is settled, define the HAVE_TK flag for the config.h file
IF(TK_LIBRARY)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
