Revision: 42404
http://brlcad.svn.sourceforge.net/brlcad/?rev=42404&view=rev
Author: starseeker
Date: 2011-01-17 16:27:46 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Update cmake branch to r42403, add realpath check to CMakeLists.txt
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/configure.ac
brlcad/branches/cmake/src/libbu/brlcad_path.c
brlcad/branches/cmake/src/tclscripts/archer/Makefile.am
brlcad/branches/cmake/src/util/bw-imp.c
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,42384-42397,42399
+
/brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378-42380,42384-42397,42399,42401-42403
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2011-01-17 16:07:00 UTC (rev
42403)
+++ brlcad/branches/cmake/CMakeLists.txt 2011-01-17 16:27:46 UTC (rev
42404)
@@ -925,6 +925,7 @@
BRLCAD_FUNCTION_EXISTS(pipe HAVE_PIPE)
BRLCAD_FUNCTION_EXISTS(popen HAVE_POPEN)
BRLCAD_FUNCTION_EXISTS(random HAVE_RANDOM)
+BRLCAD_FUNCTION_EXISTS(realpath HAVE_REALPATH)
BRLCAD_FUNCTION_EXISTS(sbrk HAVE_SBRK)
BRLCAD_FUNCTION_EXISTS(setenv HAVE_SETENV)
BRLCAD_FUNCTION_EXISTS(setpgid HAVE_SETPGID)
Modified: brlcad/branches/cmake/configure.ac
===================================================================
--- brlcad/branches/cmake/configure.ac 2011-01-17 16:07:00 UTC (rev 42403)
+++ brlcad/branches/cmake/configure.ac 2011-01-17 16:27:46 UTC (rev 42404)
@@ -314,7 +314,7 @@
# togl
#BC_ARG_ENABLE([build_togl], [togl-build], [Build the included togl], [no])
-# tkpng
+# tkpng
BC_ARG_ENABLE([build_tkpng], [tkpng-build], [Build the included tkpng], [auto])
# tktable
@@ -2267,6 +2267,7 @@
mkstemp \
pipe \
popen \
+ realpath \
sbrk \
setenv \
setpgid \
@@ -2377,7 +2378,7 @@
#AC_MSG_NOTICE([Installation of a modern GNU Flex before continuing is
recommended.])
#fi
#fi
-
+
AC_MSG_CHECKING([whether we have the essentials to make parsers])
if test "x$build_parsers" = "xyes" ; then
AC_MSG_RESULT(yes)
@@ -3229,7 +3230,7 @@
dnl *** tkpng ***
-dnl figure out whether we need to build tkpng
+dnl figure out whether we need to build tkpng
TKPNG_VERSION="0.8"
TKPNG_LIB_FILE="tkpng${SHLIB_SUFFIX}"
case $host_os in
@@ -4174,7 +4175,7 @@
dnl configure tkhtml
if test "x$build_brlcad_tkhtml" = "xyes" ; then
ac_configure_args="$ac_configure_args --exec-prefix=\"$bc_prefix\""
- # this is a hack to all tkhtml to see when the tk headers are in odd
+ # this is a hack to all tkhtml to see when the tk headers are in odd
# places. it seems to ignore the CPPFLAGS in it's configure phase.
if test ! "x$TKINCDIR" = "x" ; then
ac_configure_args="$ac_configure_args --with-tkinclude=$TKINCDIR"
Modified: brlcad/branches/cmake/src/libbu/brlcad_path.c
===================================================================
--- brlcad/branches/cmake/src/libbu/brlcad_path.c 2011-01-17 16:07:00 UTC
(rev 42403)
+++ brlcad/branches/cmake/src/libbu/brlcad_path.c 2011-01-17 16:27:46 UTC
(rev 42404)
@@ -440,7 +440,11 @@
if (lhs) {
char real_path[MAXPATHLEN] = {0};
char *dirpath;
+#ifdef HAVE_REALPATH
realpath(lhs, real_path);
+#else
+ bu_strlcpy(real_path, lhs, (size_t)MAXPATHLEN);
+#endif
dirpath = bu_dirname(real_path);
snprintf(real_path, MAXPATHLEN, "%s", dirpath);
bu_free(dirpath, "free bu_dirname");
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,42384-42397,42399
+
/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,42399,42401-42403
Modified: brlcad/branches/cmake/src/tclscripts/archer/Makefile.am
===================================================================
--- brlcad/branches/cmake/src/tclscripts/archer/Makefile.am 2011-01-17
16:07:00 UTC (rev 42403)
+++ brlcad/branches/cmake/src/tclscripts/archer/Makefile.am 2011-01-17
16:27:46 UTC (rev 42404)
@@ -39,7 +39,7 @@
Wizard.tcl \
bgerror.tcl \
cursor.tcl \
- itk_redefines \
+ itk_redefines.tcl \
tabwindow.itk
BUILT_SOURCES = \
Modified: brlcad/branches/cmake/src/util/bw-imp.c
===================================================================
--- brlcad/branches/cmake/src/util/bw-imp.c 2011-01-17 16:07:00 UTC (rev
42403)
+++ brlcad/branches/cmake/src/util/bw-imp.c 2011-01-17 16:27:46 UTC (rev
42404)
@@ -183,8 +183,8 @@
im_wpatches = (im_width+31) / 32;
im_hpatches = ((height * im_mag)+31) / 32;
if (im_wpatches*32 > 2560) {
- fprintf(stderr, "bw-imp: output %d too wide, limit is 2560\n",
- (int)im_wpatches*32);
+ fprintf(stderr, "bw-imp: output %lu too wide, limit is 2560\n",
+ (unsigned long)im_wpatches*32);
return 1;
}
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
