Revision: 40940
http://brlcad.svn.sourceforge.net/brlcad/?rev=40940&view=rev
Author: starseeker
Date: 2010-10-07 22:32:57 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
This appears to be about the minimal change to get this working - IncrTcl's use
of the private Tcl headers is a severe problem when trying to build using a
system Tcl/Tk - in practice, it shouldn't work at all. The workaround is to
use the headers from the local Tcl/Tk when building - this works if the system
version and local version are compatible. We need 8.5 from the system version
now too so this should work without needing to add local copies of the 8.4
headers. Revisit this when tcl/tk 8.6 becomes stable - this is Really Ugly.
Adding options to pass in args to avoid the complications of setting CPPFLAGS
portably in a CMake ExternalProject configure command.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/CMakeLists.txt
brlcad/branches/cmake/src/other/incrTcl/itcl/tclconfig/tcl.m4
brlcad/branches/cmake/src/other/incrTcl/itk/tclconfig/tcl.m4
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-07 19:12:22 UTC
(rev 40939)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-07 22:32:57 UTC
(rev 40940)
@@ -161,7 +161,7 @@
ENDIF(NOT BRLCAD_BUILD_LOCAL_TCL)
# Handle Tcl/Tk packages
-THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(ITCL itcl src/other/incrTcl/itcl ""
"--with-tcl=${TCL_CONF_PREFIX}")
+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_TCL)
ADD_DEPENDENCIES(itcl tcl)
ENDIF(BRLCAD_BUILD_LOCAL_TCL)
@@ -172,7 +172,7 @@
ENDIF(BRLCAD_BUILD_LOCAL_ITCL)
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ITCL_VERSION
\"${ITCL_VERSION}\"\n")
-THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(ITK itk src/other/incrTcl/itk ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX}")
+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)
ADD_DEPENDENCIES(itk itcl tcl tk)
SET(ITK_VERSION "3.3" CACHE STRING "ITK_VERSION" FORCE)
Modified: brlcad/branches/cmake/src/other/incrTcl/itcl/tclconfig/tcl.m4
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itcl/tclconfig/tcl.m4
2010-10-07 19:12:22 UTC (rev 40939)
+++ brlcad/branches/cmake/src/other/incrTcl/itcl/tclconfig/tcl.m4
2010-10-07 22:32:57 UTC (rev 40940)
@@ -3377,6 +3377,7 @@
#------------------------------------------------------------------------
AC_DEFUN([TEA_PRIVATE_TCL_HEADERS], [
+ AC_ARG_WITH(tcl-private, [--with-tcl-private directory containing private
Tcl headers], TCL_SRC_DIR=${withval})
AC_MSG_CHECKING([for Tcl private include files])
TCL_SRC_DIR_NATIVE=`${CYGPATH} ${TCL_SRC_DIR}`
Modified: brlcad/branches/cmake/src/other/incrTcl/itk/tclconfig/tcl.m4
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itk/tclconfig/tcl.m4
2010-10-07 19:12:22 UTC (rev 40939)
+++ brlcad/branches/cmake/src/other/incrTcl/itk/tclconfig/tcl.m4
2010-10-07 22:32:57 UTC (rev 40940)
@@ -3199,6 +3199,7 @@
#------------------------------------------------------------------------
AC_DEFUN(TEA_PRIVATE_TCL_HEADERS, [
+ AC_ARG_WITH(tcl-private, [--with-tcl-private directory containing private
Tcl headers], TCL_SRC_DIR=${withval})
AC_MSG_CHECKING([for Tcl private include files])
if test "${TEA_PLATFORM}" = "windows"; then
@@ -3330,6 +3331,7 @@
#------------------------------------------------------------------------
AC_DEFUN(TEA_PRIVATE_TK_HEADERS, [
+ AC_ARG_WITH(tk-private, [--with-tk-private directory containing private Tk
headers], TK_SRC_DIR=${withval})
AC_MSG_CHECKING([for Tk private include files])
if test "${TEA_PLATFORM}" = "windows"; then
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
