Revision: 41357
http://brlcad.svn.sourceforge.net/brlcad/?rev=41357&view=rev
Author: starseeker
Date: 2010-11-15 19:52:04 +0000 (Mon, 15 Nov 2010)
Log Message:
-----------
Reorder the definition of the Tcl/tk paths
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-11-15 19:45:09 UTC
(rev 41356)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-11-15 19:52:04 UTC
(rev 41357)
@@ -166,14 +166,14 @@
# Handle Tcl/Tk packages
#THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(ITCL itcl src/other/incrTcl/itcl ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tcl-private=${CMAKE_SOURCE_DIR}/src/other/tcl")
IF(BRLCAD_BUILD_LOCAL_ITCL)
+ IF(NOT BRLCAD_BUILD_LOCAL_TCL)
+ SET(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/tcl/generic
${CMAKE_CURRENT_SOURCE_DIR}/tcl/libtommath)
+ ENDIF(NOT BRLCAD_BUILD_LOCAL_TCL)
ADD_SUBDIRECTORY(incrTcl/itcl)
ADD_DEPENDENCIES(itcl tcl)
SET(ITCL_LIBRARY itcl CACHE STRING "ITCL_LIBRARY" FORCE)
get_directory_property(ITCL_INCLUDE_PATH DIRECTORY incrTcl/itcl
DEFINITION ITCL_INCLUDE_PATH)
SET(ITCL_INCLUDE_PATH "${ITCL_INCLUDE_PATH}" CACHE STRING "Itcl include
paths" FORCE)
- IF(NOT BRLCAD_BUILD_LOCAL_TCL)
- SET(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/tcl/generic
${CMAKE_CURRENT_SOURCE_DIR}/tcl/libtommath)
- ENDIF(NOT BRLCAD_BUILD_LOCAL_TCL)
ENDIF(BRLCAD_BUILD_LOCAL_ITCL)
IF(BRLCAD_BUILD_LOCAL_ITCL)
SET(ITCL_VERSION "3.4" CACHE STRING "ITCL_VERSION" FORCE)
@@ -184,13 +184,13 @@
#THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(ITK itk src/other/incrTcl/itk ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX};--with-tcl-private=${CMAKE_SOURCE_DIR}/src/other/tcl;--with-tk-private=${CMAKE_SOURCE_DIR}/src/other/tk")
IF(BRLCAD_BUILD_LOCAL_ITK)
+ IF(NOT BRLCAD_BUILD_LOCAL_TK)
+ SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/tk/generic ${CMAKE_CURRENT_SOURCE_DIR}/tk/bitmaps)
+ ENDIF(NOT BRLCAD_BUILD_LOCAL_TK)
ADD_SUBDIRECTORY(incrTcl/itk)
ADD_DEPENDENCIES(itk itcl tcl tk)
SET(ITK_LIBRARY itk CACHE STRING "ITK_LIBRARY" FORCE)
SET(ITK_VERSION "3.3" CACHE STRING "ITK_VERSION" FORCE)
- IF(NOT BRLCAD_BUILD_LOCAL_TK)
- SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/tk/generic ${CMAKE_CURRENT_SOURCE_DIR}/tk/bitmaps)
- ENDIF(NOT BRLCAD_BUILD_LOCAL_TK)
ELSE(BRLCAD_BUILD_LOCAL_ITK)
SET(ITK_VERSION "${ITCL_PACKAGE_VERSION}" CACHE STRING "ITK_VERSION" FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_ITK)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
