Revision: 42398
http://brlcad.svn.sourceforge.net/brlcad/?rev=42398&view=rev
Author: starseeker
Date: 2011-01-17 14:53:51 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Update cmake to trunk r42397
Modified Paths:
--------------
brlcad/branches/cmake/doc/docbook/Makefile.am
brlcad/branches/cmake/include/Makefile.am
brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c
brlcad/branches/cmake/src/tclscripts/archer/Makefile.am
Property Changed:
----------------
brlcad/branches/cmake/
brlcad/branches/cmake/src/other/tkhtml/
Property changes on: brlcad/branches/cmake
___________________________________________________________________
Modified: svn:mergeinfo
-
/brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378-42380
+
/brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378-42380,42384-42397
Modified: brlcad/branches/cmake/doc/docbook/Makefile.am
===================================================================
--- brlcad/branches/cmake/doc/docbook/Makefile.am 2011-01-17 14:50:34 UTC
(rev 42397)
+++ brlcad/branches/cmake/doc/docbook/Makefile.am 2011-01-17 14:53:51 UTC
(rev 42398)
@@ -110,6 +110,7 @@
fop.xconf.in \
lessons/en/Makefile.am \
lessons/es/Makefile.am \
+ log4j.properties \
resources \
specifications/en/Makefile.am \
system/README \
Modified: brlcad/branches/cmake/include/Makefile.am
===================================================================
--- brlcad/branches/cmake/include/Makefile.am 2011-01-17 14:50:34 UTC (rev
42397)
+++ brlcad/branches/cmake/include/Makefile.am 2011-01-17 14:53:51 UTC (rev
42398)
@@ -84,7 +84,8 @@
sysv.h
EXTRA_DIST = \
- sed4
+ sed4 \
+ config_win_cmake.h
if ONLY_BENCHMARK
brlcadinclude_HEADERS = $(brlcadinclude_required)
Modified: brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c
===================================================================
--- brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c 2011-01-17
14:50:34 UTC (rev 42397)
+++ brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c 2011-01-17
14:53:51 UTC (rev 42398)
@@ -40,7 +40,7 @@
# include "itcl.h"
#endif
-#ifdef HAVE_DK
+#ifdef HAVE_TK
# ifndef ITK_VERSION
# include "itk.h"
# endif
Property changes on: brlcad/branches/cmake/src/other/tkhtml
___________________________________________________________________
Modified: svn:mergeinfo
-
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378-42380
+
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378-42380,42384-42397
Modified: brlcad/branches/cmake/src/tclscripts/archer/Makefile.am
===================================================================
--- brlcad/branches/cmake/src/tclscripts/archer/Makefile.am 2011-01-17
14:50:34 UTC (rev 42397)
+++ brlcad/branches/cmake/src/tclscripts/archer/Makefile.am 2011-01-17
14:53:51 UTC (rev 42398)
@@ -39,6 +39,7 @@
Wizard.tcl \
bgerror.tcl \
cursor.tcl \
+ itk_redefines \
tabwindow.itk
BUILT_SOURCES = \
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
