[brlcad-commits] SF.net SVN: brlcad:[42821] brlcad/trunk
Revision: 42821 http://brlcad.svn.sourceforge.net/brlcad/?rev=42821view=rev Author: jordisayol Date: 2011-02-01 09:14:20 + (Tue, 01 Feb 2011) Log Message: --- add two new doc menu entries Modified Paths: -- brlcad/trunk/misc/debian/brlcad.install brlcad/trunk/sh/make_deb.sh Added Paths: --- brlcad/trunk/misc/debian/brlcad-doc-animation.desktop brlcad/trunk/misc/debian/brlcad-doc-mged.desktop Added: brlcad/trunk/misc/debian/brlcad-doc-animation.desktop === (Binary files differ) Property changes on: brlcad/trunk/misc/debian/brlcad-doc-animation.desktop ___ Added: svn:mime-type + application/x-desktop Added: brlcad/trunk/misc/debian/brlcad-doc-mged.desktop === (Binary files differ) Property changes on: brlcad/trunk/misc/debian/brlcad-doc-mged.desktop ___ Added: svn:mime-type + application/x-desktop Modified: brlcad/trunk/misc/debian/brlcad.install === --- brlcad/trunk/misc/debian/brlcad.install 2011-02-01 06:44:46 UTC (rev 42820) +++ brlcad/trunk/misc/debian/brlcad.install 2011-02-01 09:14:20 UTC (rev 42821) @@ -6,6 +6,8 @@ debian/brlcad-rtwizard.desktop usr/share/applications debian/brlcad-db.desktop usr/share/applications debian/brlcad-doc.desktop usr/share/applications +debian/brlcad-doc-animation.desktop usr/share/applications +debian/brlcad-doc-mged.desktop usr/share/applications debian/brlcad.directory usr/share/desktop-directories debian/brlcad-doc.directory usr/share/desktop-directories debian/brlcad.png usr/share/icons/hicolor/48x48/apps Modified: brlcad/trunk/sh/make_deb.sh === --- brlcad/trunk/sh/make_deb.sh 2011-02-01 06:44:46 UTC (rev 42820) +++ brlcad/trunk/sh/make_deb.sh 2011-02-01 09:14:20 UTC (rev 42821) @@ -47,7 +47,7 @@ # show help if test -z $1 ;then -echo Script to create binary deb package, or debian source packages. +echo Script to create binary deb package, and debian source packages. echo echo Usage: echo sh/make_deb.sh -b | -s @@ -123,10 +123,18 @@ fi } -fdoc xdg-open /usr/brlcad/share/brlcad/$BVERSION/html/toc.html misc/debian/brlcad-doc.desktop +fdoc xdg-open /usr/brlcad/share/brlcad/$BVERSION/html/toc.html \ + misc/debian/brlcad-doc.desktop -fdoc xdg-open /usr/brlcad/share/brlcad/$BVERSION/db misc/debian/brlcad-db.desktop +fdoc xdg-open /usr/brlcad/share/brlcad/$BVERSION/db \ + misc/debian/brlcad-db.desktop +fdoc xdg-open /usr/brlcad/share/brlcad/$BVERSION/html/manuals/mged/index.html \ + misc/debian/brlcad-doc-mged.desktop + +fdoc xdg-open /usr/brlcad/share/brlcad/$BVERSION/html/manuals/Anim_Tutorial/index.html \ + misc/debian/brlcad-doc-animation.desktop + # update debian/chagelog if needed if test -s $CFILE test `sed -n '1p' $CFILE | grep brlcad ($BVERSION- | wc -l` = 0 ; then L1=brlcad ($BVERSION-0) unstable; urgency=low\n\n This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42822] brlcad/branches/cmake/CMakeLists.txt
Revision: 42822
http://brlcad.svn.sourceforge.net/brlcad/?rev=42822view=rev
Author: starseeker
Date: 2011-02-01 15:41:27 + (Tue, 01 Feb 2011)
Log Message:
---
Eeek. This appears to be a working per-directory noprod solution. Done the
best I can for convenience vs. policy - CMP0002 forbids non-unique target
names, and hence excludes a 'make noprod' rule for each directory. Even
forcing that to OLD, get some odd behavior with the toplevel 'make noprod' rule
(not surprisingly, the policy is there for a reason). Hence, there is a
toplevel make noprod command and in subdirectories 'make noprod' becomes 'cmake
-P ./cmake_noprod.cmake'
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-02-01 09:14:20 UTC (rev
42821)
+++ brlcad/branches/cmake/CMakeLists.txt2011-02-01 15:41:27 UTC (rev
42822)
@@ -77,7 +77,9 @@
# Minimum required version of CMake
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
IF(COMMAND CMAKE_POLICY)
- #CMAKE_POLICY(SET CMP0002 OLD)
+ # Needs to be old for per-directory make noprod, by default
+ # disable per-directory make noprod and keep new behavior
+ CMAKE_POLICY(SET CMP0002 OLD)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
@@ -135,11 +137,24 @@
# the function names and call the _add_* functions to access the CMake
# functionality previously available under the add_* functions. See
# http://www.cmake.org/pipermail/cmake/2010-September/039388.html
-# Zero out the lists at the beginning of the run to avoid duplicate
-# and stale entries.
-# !!! TODO !!! is this working check and perhaps fix
+# A further compilcation is that functions have local variable scope,
+# hence the use of properties to allow access to directory-specific
+# and global information scopes.
+# The BRL-CAD build generates cmake_noprod.cmake files that can be
+# manually run to simulate the workings of make noprod in that directory:
+#
+# cmake -P ./cmake_noprod.cmake
+#
+# This will remove just the final output files from all exec and
+# library targets in that directory. It is not practical to have
+# 'make noprod' targets in each directory in the current CMake
+# system, so there is one toplevel 'noprod' target and in subdirectories
+# the above command must be used.
+
+define_property(GLOBAL PROPERTY CHILD_LIST BRIEF_DOCS child list FULL_DOCS
tmp child target list)
+
define_property(GLOBAL PROPERTY CMAKE_LIBRARY_TARGET_LIST BRIEF_DOCS
libtarget list FULL_DOCS Library target list)
function(add_library name)
get_property(CMAKE_LIBRARY_TARGET_LIST GLOBAL PROPERTY
CMAKE_LIBRARY_TARGET_LIST)
@@ -148,6 +163,7 @@
set_target_properties(${name} PROPERTIES PREFIX )
ENDIF(${name} MATCHES ^lib*)
set_property(GLOBAL APPEND PROPERTY CMAKE_LIBRARY_TARGET_LIST ${name})
+ set_property(GLOBAL APPEND PROPERTY CHILD_LIST ${name})
endfunction(add_library)
define_property(GLOBAL PROPERTY CMAKE_EXEC_TARGET_LIST BRIEF_DOCS exec target
list FULL_DOCS Executable target list)
@@ -168,22 +184,73 @@
MARK_AS_ADVANCED(CMAKE_EXEC_TARGET_LIST)
MARK_AS_ADVANCED(CMAKE_CUSTOM_TARGET_LIST)
-define_property(GLOBAL PROPERTY CHILD_LIST BRIEF_DOCS child list FULL_DOCS
tmp child target list)
-define_property(DIRECTORY PROPERTY EXEC_LIST BRIEF_DOCS dir exec list
FULL_DOCS Directory executable target list)
+define_property(DIRECTORY PROPERTY DIR_TARGET_LIST BRIEF_DOCS dir list
FULL_DOCS Directory target list)
function(add_subdirectory name)
set_property(GLOBAL PROPERTY CHILD_LIST )
_add_subdirectory(${name} ${ARGN})
- get_property(exec_list GLOBAL PROPERTY CHILD_LIST)
- set_property(DIRECTORY ${name} APPEND PROPERTY EXEC_LIST ${exec_list})
- get_property(exec_list DIRECTORY ${name} PROPERTY EXEC_LIST)
- #MESSAGE(Added directory ${name}, exec_list: ${exec_list})
- cmake_policy(GET CMP0002 POLICY)
- IF(${POLICY} MATCHES ^OLD$)
- #MESSAGE(Found old target naming policy - try to make noprod
target for ${name} directory)
- ENDIF(${POLICY} MATCHES ^OLD$)
- set_property(DIRECTORY APPEND PROPERTY EXEC_LIST ${exec_list})
- get_property(exec_list DIRECTORY PROPERTY EXEC_LIST)
- #MESSAGE(Current directory ${CMAKE_CURRENT_SOURCE_DIR}, exec_list:
${exec_list})
+ get_property(target_list GLOBAL PROPERTY CHILD_LIST)
+ set_property(DIRECTORY ${name} APPEND PROPERTY DIR_TARGET_LIST
${target_list})
+ set_property(DIRECTORY APPEND PROPERTY DIR_TARGET_LIST ${target_list})
+ get_property(target_list DIRECTORY ${name} PROPERTY DIR_TARGET_LIST)
+ IF(target_list)
+ SET(CMAKE_TARGET_FILE_LIST )
+ FOREACH(target ${target_list})
+ get_target_property(targetfile
[brlcad-commits] SF.net SVN: brlcad:[42823] brlcad/branches/cmake
Revision: 42823
http://brlcad.svn.sourceforge.net/brlcad/?rev=42823view=rev
Author: starseeker
Date: 2011-02-01 16:11:02 + (Tue, 01 Feb 2011)
Log Message:
---
Fix step build properly - surprise, surprise using scl_cf.h correctly actually
helped
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/other/step/CMakeLists.txt
brlcad/branches/cmake/src/other/step/src/clstepcore/ExpDict.cc
brlcad/branches/cmake/src/other/step/src/clstepcore/sdai.h
brlcad/branches/cmake/src/other/step/src/clutils/dirobj.cc
brlcad/branches/cmake/src/other/step/src/clutils/gennodearray.cc
brlcad/branches/cmake/src/other/step/src/clutils/scl_char_str_list.cc
Added Paths:
---
brlcad/branches/cmake/src/other/step/include/scl_cf.h.in
Removed Paths:
-
brlcad/branches/cmake/src/other/step/include/scl_config.h.in
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-02-01 15:41:27 UTC (rev
42822)
+++ brlcad/branches/cmake/CMakeLists.txt2011-02-01 16:11:02 UTC (rev
42823)
@@ -1448,6 +1448,15 @@
SET(CPACK_PACKAGE_VERSION_MINOR ${BRLCAD_MINOR_VERSION})
SET(CPACK_PACKAGE_VERSION_PATCH ${BRLCAD_PATCH_VERSION})
+IF(UNIX)
+ FOREACH(target ${CMAKE_EXEC_TARGET_LIST})
+ get_target_property(targetfile ${target} LOCATION)
+ IF(targetfile)
+ SET(CPACK_STRIP_FILES
${CMAKE_STRIP_FILE_LIST};${targetfile})
+ ENDIF(targetfile)
+ ENDFOREACH(target ${CMAKE_EXEC_TARGET_LIST})
+ENDIF(UNIX)
+
IF(UNIX AND NOT APPLE)
SET(CPACK_GENERATOR TGZ TBZ2)
ENDIF(UNIX AND NOT APPLE)
Modified: brlcad/branches/cmake/src/other/step/CMakeLists.txt
===
--- brlcad/branches/cmake/src/other/step/CMakeLists.txt 2011-02-01 15:41:27 UTC
(rev 42822)
+++ brlcad/branches/cmake/src/other/step/CMakeLists.txt 2011-02-01 16:11:02 UTC
(rev 42823)
@@ -192,8 +192,12 @@
CHECK_TYPE_SIZE(ssize_t SSIZE_T)
# Now that all the tests are done, configure the scl_config.h file:
-configure_file(${SCL_SOURCE_DIR}/include/scl_config.h.in
${SCL_BINARY_DIR}/include/scl_config.h)
+configure_file(${SCL_SOURCE_DIR}/include/scl_cf.h.in
${SCL_BINARY_DIR}/include/scl_cf.h)
+add_definitions(
+ -DHAVE_CONFIG_H
+ )
+
include_directories(
${SCL_SOURCE_DIR}/include
${SCL_BINARY_DIR}/include
Copied: brlcad/branches/cmake/src/other/step/include/scl_cf.h.in (from rev
42815, brlcad/branches/cmake/src/other/step/include/scl_config.h.in)
===
--- brlcad/branches/cmake/src/other/step/include/scl_cf.h.in
(rev 0)
+++ brlcad/branches/cmake/src/other/step/include/scl_cf.h.in2011-02-01
16:11:02 UTC (rev 42823)
@@ -0,0 +1,10 @@
+/ Define statements for CMake /
+#cmakedefine HAVE_NDIR_H 1
+#cmakedefine HAVE_STDARG_H 1
+#cmakedefine HAVE_SYS_STAT_H 1
+#cmakedefine HAVE_SYSENT_H 1
+#cmakedefine HAVE_UNISTD_H 1
+#cmakedefine HAVE_ABS 1
+#cmakedefine HAVE_MEMCPY 1
+#cmakedefine HAVE_MEMMOVE 1
+#cmakedefine HAVE_SSIZE_T 1
Deleted: brlcad/branches/cmake/src/other/step/include/scl_config.h.in
===
--- brlcad/branches/cmake/src/other/step/include/scl_config.h.in
2011-02-01 15:41:27 UTC (rev 42822)
+++ brlcad/branches/cmake/src/other/step/include/scl_config.h.in
2011-02-01 16:11:02 UTC (rev 42823)
@@ -1,10 +0,0 @@
-/ Define statements for CMake /
-#cmakedefine HAVE_NDIR_H 1
-#cmakedefine HAVE_STDARG_H 1
-#cmakedefine HAVE_SYS_STAT_H 1
-#cmakedefine HAVE_SYSENT_H 1
-#cmakedefine HAVE_UNISTD_H 1
-#cmakedefine HAVE_ABS 1
-#cmakedefine HAVE_MEMCPY 1
-#cmakedefine HAVE_MEMMOVE 1
-#cmakedefine HAVE_SSIZE_T 1
Modified: brlcad/branches/cmake/src/other/step/src/clstepcore/ExpDict.cc
===
--- brlcad/branches/cmake/src/other/step/src/clstepcore/ExpDict.cc
2011-02-01 15:41:27 UTC (rev 42822)
+++ brlcad/branches/cmake/src/other/step/src/clstepcore/ExpDict.cc
2011-02-01 16:11:02 UTC (rev 42823)
@@ -11,6 +11,10 @@
*/
/* $Id: ExpDict.cc,v 3.0.1.7 1998/02/17 19:19:15 sauderd DP3.1 $ */
+#ifdef HAVE_CONFIG_H
+# include scl_cf.h
+#endif
+
#include memory.h
#include math.h
#include stdio.h
Modified: brlcad/branches/cmake/src/other/step/src/clstepcore/sdai.h
===
--- brlcad/branches/cmake/src/other/step/src/clstepcore/sdai.h 2011-02-01
15:41:27 UTC (rev 42822)
+++ brlcad/branches/cmake/src/other/step/src/clstepcore/sdai.h 2011-02-01
16:11:02 UTC (rev 42823)
@@ -20,6 +20,10 @@
/* $Id: sdai.h,v 3.0.1.12 1997/11/05 22:52:58 sauderd DP3.1 $ */
+#ifdef HAVE_CONFIG_H
+# include scl_cf.h
[brlcad-commits] SF.net SVN: brlcad:[42824] brlcad/branches/cmake/src/conv/step/CMakeLists. txt
Revision: 42824
http://brlcad.svn.sourceforge.net/brlcad/?rev=42824view=rev
Author: starseeker
Date: 2011-02-01 16:19:52 + (Tue, 01 Feb 2011)
Log Message:
---
Add the output include dir for step
Modified Paths:
--
brlcad/branches/cmake/src/conv/step/CMakeLists.txt
Modified: brlcad/branches/cmake/src/conv/step/CMakeLists.txt
===
--- brlcad/branches/cmake/src/conv/step/CMakeLists.txt 2011-02-01 16:11:02 UTC
(rev 42823)
+++ brlcad/branches/cmake/src/conv/step/CMakeLists.txt 2011-02-01 16:19:52 UTC
(rev 42824)
@@ -375,11 +375,12 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${BRLCAD_SCL_INCLUDE_DIR}
+ ${BRLCAD_SOURCE_DIR}/src/other/step/src/clstepcore
${BRLCAD_SOURCE_DIR}/src/other/step/src/cleditor
- ${BRLCAD_SOURCE_DIR}/src/other/step/src/clstepcore
${BRLCAD_SOURCE_DIR}/src/other/step/src/clutils
${BRLCAD_SOURCE_DIR}/src/other/step/src/cldai
${BRLCAD_SOURCE_DIR}/src/other/step/src/test
+ ${CMAKE_BINARY_DIR}/src/other/step/include
${OPENNURBS_INCLUDE_DIR}
${TNT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42825] brlcad/branches/cmake/src/other/tcl/CMakeLists. txt
Revision: 42825
http://brlcad.svn.sourceforge.net/brlcad/?rev=42825view=rev
Author: starseeker
Date: 2011-02-01 17:05:04 + (Tue, 01 Feb 2011)
Log Message:
---
Nevermind the dash - this symlink logic is too fragile, so just go with CMake
standard practice
Modified Paths:
--
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2011-02-01 16:19:52 UTC
(rev 42824)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2011-02-01 17:05:04 UTC
(rev 42825)
@@ -737,13 +737,7 @@
add_executable(tclsh ${TCLSH_SRCS})
target_link_libraries(tclsh tcl ${SUN_MATH_LIB} ${EXTRA_TCLSH_LIBS})
install(TARGETS tclsh DESTINATION bin)
-# Regrettably, setting the VERSION variable on the tclsh target produces a
symlink with a dash (which is a sensible default but
-# inconsistent with standard tcl practice) and I don't see how to alter that.
-# This is the workaround. Note that this fails for make package - needs
-# fixing.
-GET_FILENAME_COMPONENT(TCLSH_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/bin/tclsh
ABSOLUTE)
-FILE(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/tclsh_make_symlink.cmake
exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${TCLSH_INSTALL_NAME}
${TCLSH_INSTALL_NAME}${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}))
-set_target_properties(tclsh PROPERTIES POST_INSTALL_SCRIPT
${CMAKE_BINARY_DIR}/CMakeTmp/tclsh_make_symlink.cmake)
+SET_TARGET_PROPERTIES(tcl PROPERTIES VERSION
${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR})
SET(TCL_HDRS
generic/tcl.h
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42826] brlcad/trunk/misc/Makefile.am
Revision: 42826 http://brlcad.svn.sourceforge.net/brlcad/?rev=42826view=rev Author: jordisayol Date: 2011-02-01 17:08:39 + (Tue, 01 Feb 2011) Log Message: --- add two debian doc menu entries Modified Paths: -- brlcad/trunk/misc/Makefile.am Modified: brlcad/trunk/misc/Makefile.am === --- brlcad/trunk/misc/Makefile.am 2011-02-01 17:05:04 UTC (rev 42825) +++ brlcad/trunk/misc/Makefile.am 2011-02-01 17:08:39 UTC (rev 42826) @@ -36,18 +36,20 @@ debian/brlcad-archer.png \ debian/brlcad-db.desktop \ debian/brlcad-db.png \ + debian/brlcad.directory \ + debian/brlcad-doc-animation.desktop \ debian/brlcad-doc.desktop \ debian/brlcad-doc.directory \ + debian/brlcad-doc-mged.desktop \ debian/brlcad-doc.png \ - debian/brlcad-mged.desktop \ - debian/brlcad-rtwizard.desktop \ - debian/brlcad.directory \ debian/brlcad.docs \ debian/brlcad.install \ debian/brlcad.menu \ + debian/brlcad-mged.desktop \ debian/brlcad.png \ debian/brlcad.postinst \ debian/brlcad.postrm \ + debian/brlcad-rtwizard.desktop \ debian/brlcad.sh \ debian/changelog \ debian/compat \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42827] brlcad/branches/cmake
Revision: 42827
http://brlcad.svn.sourceforge.net/brlcad/?rev=42827view=rev
Author: starseeker
Date: 2011-02-01 17:52:34 + (Tue, 01 Feb 2011)
Log Message:
---
Ah - remove files based on version number properties as well for noprod. Start
using the exec list to strip executables for CPack
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/misc/CMake/FindTCL.cmake
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
brlcad/branches/cmake/src/other/tk/CMakeLists.txt
brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-02-01 17:08:39 UTC (rev
42826)
+++ brlcad/branches/cmake/CMakeLists.txt2011-02-01 17:52:34 UTC (rev
42827)
@@ -77,9 +77,6 @@
# Minimum required version of CMake
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
IF(COMMAND CMAKE_POLICY)
- # Needs to be old for per-directory make noprod, by default
- # disable per-directory make noprod and keep new behavior
- CMAKE_POLICY(SET CMP0002 OLD)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
@@ -196,7 +193,15 @@
SET(CMAKE_TARGET_FILE_LIST )
FOREACH(target ${target_list})
get_target_property(targetfile ${target} LOCATION)
+ get_target_property(targetversion ${target} VERSION)
+ get_target_property(targetsoversion ${target} SOVERSION)
SET(CMAKE_TARGET_FILE_LIST
${CMAKE_TARGET_FILE_LIST};${targetfile})
+ IF(targetsoversion)
+ SET(CMAKE_TARGET_FILE_LIST
${CMAKE_TARGET_FILE_LIST};${targetfile}.${targetsoversion})
+ ENDIF(targetsoversion)
+ IF(targetversion)
+ SET(CMAKE_TARGET_FILE_LIST
${CMAKE_TARGET_FILE_LIST};${targetfile}-${targetversion};${targetfile}.${targetversion})
+ ENDIF(targetversion)
ENDFOREACH(target ${target_list})
STRING(REGEX REPLACE ; \\\; TARGET_FILES
${CMAKE_TARGET_FILE_LIST})
@@ -229,7 +234,15 @@
SET(CMAKE_TARGET_FILE_LIST )
FOREACH(target ${target_list})
get_target_property(targetfile ${target} LOCATION)
+ get_target_property(targetversion ${target} VERSION)
+ get_target_property(targetsoversion ${target} SOVERSION)
SET(CMAKE_TARGET_FILE_LIST
${CMAKE_TARGET_FILE_LIST};${targetfile})
+ IF(targetsoversion)
+ SET(CMAKE_TARGET_FILE_LIST
${CMAKE_TARGET_FILE_LIST};${targetfile}.${targetsoversion})
+ ENDIF(targetsoversion)
+ IF(targetversion)
+ SET(CMAKE_TARGET_FILE_LIST
${CMAKE_TARGET_FILE_LIST};${targetfile}-${targetversion};${targetfile}.${targetversion})
+ ENDIF(targetversion)
ENDFOREACH(target ${target_list})
STRING(REGEX REPLACE ; \\\; TARGET_FILES
${CMAKE_TARGET_FILE_LIST})
@@ -1348,12 +1361,24 @@
get_property(CMAKE_LIBRARY_TARGET_LIST GLOBAL PROPERTY
CMAKE_LIBRARY_TARGET_LIST)
FOREACH(target ${CMAKE_LIBRARY_TARGET_LIST})
get_target_property(targetfile ${target} LOCATION)
+ get_target_property(targetversion ${target} VERSION)
+ get_target_property(targetsoversion ${target} SOVERSION)
SET(CMAKE_TARGET_FILE_LIST ${CMAKE_TARGET_FILE_LIST};${targetfile})
+ IF(targetsoversion)
+ SET(CMAKE_TARGET_FILE_LIST
${CMAKE_TARGET_FILE_LIST};${targetfile}.${targetsoversion})
+ ENDIF(targetsoversion)
+ IF(targetversion)
+ SET(CMAKE_TARGET_FILE_LIST
${CMAKE_TARGET_FILE_LIST};${targetfile}-${targetversion};${targetfile}.${targetversion})
+ ENDIF(targetversion)
ENDFOREACH(target ${CMAKE_LIBRARY_TARGET_LIST})
get_property(CMAKE_EXEC_TARGET_LIST GLOBAL PROPERTY CMAKE_EXEC_TARGET_LIST)
FOREACH(target ${CMAKE_EXEC_TARGET_LIST})
get_target_property(targetfile ${target} LOCATION)
+ get_target_property(targetversion ${target} VERSION)
SET(CMAKE_TARGET_FILE_LIST ${CMAKE_TARGET_FILE_LIST};${targetfile})
+ IF(targetversion)
+ SET(CMAKE_TARGET_FILE_LIST
${CMAKE_TARGET_FILE_LIST};${targetfile}-${targetversion};${targetfile}.${targetversion})
+ ENDIF(targetversion)
ENDFOREACH(target ${CMAKE_EXEC_TARGET_LIST})
STRING(REGEX REPLACE ; \\\; TARGET_FILES ${CMAKE_TARGET_FILE_LIST})
Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2011-02-01 17:08:39 UTC
(rev 42826)
+++
[brlcad-commits] SF.net SVN: brlcad:[42828] brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c
Revision: 42828
http://brlcad.svn.sourceforge.net/brlcad/?rev=42828view=rev
Author: erikgreenwald
Date: 2011-02-01 18:32:56 + (Tue, 01 Feb 2011)
Log Message:
---
Remove the HIDDEN from these junk functions to avoid unused symbol failures
when debugging is off.
Modified Paths:
--
brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c
===
--- brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c2011-02-01 17:52:34 UTC
(rev 42827)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_junk.c2011-02-01 18:32:56 UTC
(rev 42828)
@@ -69,7 +69,7 @@
* about not creating fundamental structures on his own... :-)
* Retired in favor of more modern tessellation strategies.
*/
-HIDDEN struct shell *
+struct shell *
nmg_polytonmg(FILE *fp, struct nmgregion *r, const struct bn_tol *tol)
{
int i, j, num_pts, num_facets, pts_this_face, facet;
@@ -180,7 +180,7 @@
* does only interior edges, and is not a general face/shell
* intersector.
*/
-HIDDEN void
+void
nmg_isect_face3p_shell_int(struct nmg_inter_struct *is, struct faceuse *fu1,
struct shell *s2)
{
struct shell *s1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42829] brlcad/branches/cmake/src/other/step/CMake/ SCL_Utils.cmake
Revision: 42829
http://brlcad.svn.sourceforge.net/brlcad/?rev=42829view=rev
Author: starseeker
Date: 2011-02-01 18:43:06 + (Tue, 01 Feb 2011)
Log Message:
---
Don't use absolute install paths
Modified Paths:
--
brlcad/branches/cmake/src/other/step/CMake/SCL_Utils.cmake
Modified: brlcad/branches/cmake/src/other/step/CMake/SCL_Utils.cmake
===
--- brlcad/branches/cmake/src/other/step/CMake/SCL_Utils.cmake 2011-02-01
18:32:56 UTC (rev 42828)
+++ brlcad/branches/cmake/src/other/step/CMake/SCL_Utils.cmake 2011-02-01
18:43:06 UTC (rev 42829)
@@ -15,7 +15,7 @@
STRING(REGEX REPLACE ; libslist ${libs})
add_executable(${execname} ${srcslist})
target_link_libraries(${execname} ${libslist})
- INSTALL(TARGETS ${execname} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+ INSTALL(TARGETS ${execname} RUNTIME DESTINATION bin)
# Enable extra compiler flags if local executables and/or global options
dictate
SET(LOCAL_COMPILE_FLAGS )
FOREACH(extraarg ${ARGN})
@@ -39,7 +39,7 @@
target_link_libraries(${libname} ${libslist})
endif(NOT ${libs} MATCHES NONE)
SET_TARGET_PROPERTIES(${libname} PROPERTIES VERSION
${SCL_VERSION_MAJOR}.${SCL_VERSION_MINOR} SOVERSION ${SCL_VERSION_MAJOR} )
- INSTALL(TARGETS ${libname} LIBRARY DESTINATION
${CMAKE_INSTALL_PREFIX}/lib)
+ INSTALL(TARGETS ${libname} LIBRARY DESTINATION lib)
ENDIF(BUILD_SHARED_LIBS)
IF(BUILD_STATIC_LIBS AND NOT MSVC)
add_library(${libname}-static STATIC ${srcslist})
@@ -55,7 +55,7 @@
#
http://www.cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F
SET_TARGET_PROPERTIES(${libname}-static PROPERTIES PREFIX
lib)
ENDIF(WIN32)
- INSTALL(TARGETS ${libname}-static ARCHIVE DESTINATION
${CMAKE_INSTALL_PREFIX}/lib)
+ INSTALL(TARGETS ${libname}-static ARCHIVE DESTINATION lib)
ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
# Enable extra compiler flags if local libraries and/or global options
dictate
SET(LOCAL_COMPILE_FLAGS )
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42830] brlcad/branches/cmake
Revision: 42830
http://brlcad.svn.sourceforge.net/brlcad/?rev=42830view=rev
Author: starseeker
Date: 2011-02-01 18:54:15 + (Tue, 01 Feb 2011)
Log Message:
---
another absolute install path
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/misc/CMake/FindTCL.cmake
brlcad/branches/cmake/src/conv/step/CMakeLists.txt
brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-02-01 18:43:06 UTC (rev
42829)
+++ brlcad/branches/cmake/CMakeLists.txt2011-02-01 18:54:15 UTC (rev
42830)
@@ -1483,7 +1483,10 @@
ENDIF(UNIX)
IF(UNIX AND NOT APPLE)
-SET(CPACK_GENERATOR TGZ TBZ2)
+ SET(CPACK_GENERATOR TGZ TBZ2)
+ SET(CPACK_PACKAGE_FILE_NAME
BRL-CAD_${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}_${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR})
+ELSE(UNIX AND NOT APPLE)
+ SET(CPACK_PACKAGE_FILE_NAME
BRL-CAD_${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}_${CMAKE_SYSTEM_PROCESSOR})
ENDIF(UNIX AND NOT APPLE)
IF(WIN32)
Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2011-02-01 18:43:06 UTC
(rev 42829)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2011-02-01 18:54:15 UTC
(rev 42830)
@@ -623,7 +623,6 @@
ELSEIF(EXISTS
${TCL_TCLSH_EXECUTABLE}/bin/tclsh)
SET(TCL_TCLSH_EXECUTABLE
${TCL_TCLSH_EXECUTABLE}/bin/tclsh)
ENDIF()
- ENDIF()
ENDIF(MSVC)
endif()
IF(${line} MATCHES TCL_STUB_LIB_PATH)
Modified: brlcad/branches/cmake/src/conv/step/CMakeLists.txt
===
--- brlcad/branches/cmake/src/conv/step/CMakeLists.txt 2011-02-01 18:43:06 UTC
(rev 42829)
+++ brlcad/branches/cmake/src/conv/step/CMakeLists.txt 2011-02-01 18:54:15 UTC
(rev 42830)
@@ -389,4 +389,4 @@
add_executable(step-g ${stepg_SOURCES})
target_link_libraries(step-g libwdb librt libbu steputils stepcore stepdai
stepeditor ${OPENNURBS_LIBRARY})
-INSTALL(TARGETS step-g RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+INSTALL(TARGETS step-g RUNTIME DESTINATION bin)
Modified: brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake2011-02-01
18:43:06 UTC (rev 42829)
+++ brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake2011-02-01
18:54:15 UTC (rev 42830)
@@ -623,7 +623,6 @@
ELSEIF(EXISTS
${TCL_TCLSH_EXECUTABLE}/bin/tclsh)
SET(TCL_TCLSH_EXECUTABLE
${TCL_TCLSH_EXECUTABLE}/bin/tclsh)
ENDIF()
- ENDIF()
ENDIF(MSVC)
endif()
IF(${line} MATCHES TCL_STUB_LIB_PATH)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42831] brlcad/branches/cmake
Revision: 42831
http://brlcad.svn.sourceforge.net/brlcad/?rev=42831view=rev
Author: starseeker
Date: 2011-02-01 19:20:03 + (Tue, 01 Feb 2011)
Log Message:
---
Little more tweaking to mark variables as advanced
Modified Paths:
--
brlcad/branches/cmake/misc/CMake/FindTCL.cmake
brlcad/branches/cmake/misc/CMake/ThirdParty.cmake
brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake
Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2011-02-01 18:54:15 UTC
(rev 42830)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2011-02-01 19:20:03 UTC
(rev 42831)
@@ -998,6 +998,8 @@
SET(${pkgvar} ${${pkgvar}} CACHE STRING set by FindTCL FORCE)
ENDFOREACH(pkgvar ${PACKAGE_HANDLE_VARS})
+ENDIF(NOT TCL_FOUND)
+
MARK_AS_ADVANCED(
TCL_INCLUDE_DIRS
TCL_INCLUDE_PATH
@@ -1017,7 +1019,6 @@
TCL_CONF_PREFIX
TCL_TK_CONF_PREFIX
)
-ENDIF(NOT TCL_FOUND)
# Other variables to hide
MARK_AS_ADVANCED(
Modified: brlcad/branches/cmake/misc/CMake/ThirdParty.cmake
===
--- brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2011-02-01 18:54:15 UTC
(rev 42830)
+++ brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2011-02-01 19:20:03 UTC
(rev 42831)
@@ -29,9 +29,7 @@
SET(${upper}_FOUND ${upper}-NOTFOUND CACHE STRING
${upper}_FOUND FORCE)
MARK_AS_ADVANCED(${upper}_FOUND)
SET(${upper}_LIBRARY ${upper}-NOTFOUND CACHE STRING
${upper}_LIBRARY FORCE)
- MARK_AS_ADVANCED(${upper}_LIBRARY)
SET(${upper}_INCLUDE_DIR ${upper}-NOTFOUND CACHE STRING
${upper}_INCLUDE_DIR FORCE)
- MARK_AS_ADVANCED(${upper}_INCLUDE_DIR)
IF(EXISTS ${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
INCLUDE(${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
ELSE(EXISTS
${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
@@ -63,6 +61,8 @@
SET(${upper}_LIBRARY ${lower} CACHE STRING set by
THIRD_PARTY macro FORCE)
ENDIF(NOT ${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OR
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
MARK_AS_ADVANCED(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper})
+ MARK_AS_ADVANCED(${upper}_LIBRARY)
+ MARK_AS_ADVANCED(${upper}_INCLUDE_DIR)
ENDMACRO(THIRD_PARTY_OPTION)
#-
Modified: brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake2011-02-01
18:54:15 UTC (rev 42830)
+++ brlcad/branches/cmake/src/other/togl/CMake/FindTCL.cmake2011-02-01
19:20:03 UTC (rev 42831)
@@ -998,6 +998,8 @@
SET(${pkgvar} ${${pkgvar}} CACHE STRING set by FindTCL FORCE)
ENDFOREACH(pkgvar ${PACKAGE_HANDLE_VARS})
+ENDIF(NOT TCL_FOUND)
+
MARK_AS_ADVANCED(
TCL_INCLUDE_DIRS
TCL_INCLUDE_PATH
@@ -1017,7 +1019,6 @@
TCL_CONF_PREFIX
TCL_TK_CONF_PREFIX
)
-ENDIF(NOT TCL_FOUND)
# Other variables to hide
MARK_AS_ADVANCED(
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42832] brlcad/branches/cmake/src/tclscripts/ampi.tcl
Revision: 42832
http://brlcad.svn.sourceforge.net/brlcad/?rev=42832view=rev
Author: starseeker
Date: 2011-02-01 19:25:02 + (Tue, 01 Feb 2011)
Log Message:
---
verbose flag is intentional to highlight problems - restore
Modified Paths:
--
brlcad/branches/cmake/src/tclscripts/ampi.tcl
Modified: brlcad/branches/cmake/src/tclscripts/ampi.tcl
===
--- brlcad/branches/cmake/src/tclscripts/ampi.tcl 2011-02-01 19:20:03 UTC
(rev 42831)
+++ brlcad/branches/cmake/src/tclscripts/ampi.tcl 2011-02-01 19:25:02 UTC
(rev 42832)
@@ -33,7 +33,7 @@
foreach arg $argv {
# generate a pkgIndex.tcl file in the arg dir
puts Generating pkgIndex.tcl in $arg
-catch {pkg_mkIndex $arg *.tcl *.itcl *.itk *.sh}
+catch {pkg_mkIndex -verbose $arg *.tcl *.itcl *.itk *.sh}
if {![file exists $arg/pkgIndex.tcl]} {
puts ERROR: pkgIndex.tcl does not exist in $arg
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42836] brlcad/trunk/src/libbn/anim.c
Revision: 42836
http://brlcad.svn.sourceforge.net/brlcad/?rev=42836view=rev
Author: starseeker
Date: 2011-02-01 19:45:37 + (Tue, 01 Feb 2011)
Log Message:
---
initialize dir (quiet a warning)
Modified Paths:
--
brlcad/trunk/src/libbn/anim.c
Modified: brlcad/trunk/src/libbn/anim.c
===
--- brlcad/trunk/src/libbn/anim.c 2011-02-01 19:42:53 UTC (rev 42835)
+++ brlcad/trunk/src/libbn/anim.c 2011-02-01 19:45:37 UTC (rev 42836)
@@ -693,7 +693,7 @@
anim_steer_mat(mat_t mat, vect_t point, int end)
{
static vect_t p1, p2, p3;
-vect_t dir;
+vect_t dir = {0.0,0.0,0.0};
static vect_t norm;
static int state = ASM_EMPTY;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42837] brlcad/trunk/misc/debian
Revision: 42837 http://brlcad.svn.sourceforge.net/brlcad/?rev=42837view=rev Author: brlcad Date: 2011-02-01 20:32:56 + (Tue, 01 Feb 2011) Log Message: --- switch to text/plain and set eol-style to native Property Changed: brlcad/trunk/misc/debian/brlcad-archer.desktop brlcad/trunk/misc/debian/brlcad-db.desktop brlcad/trunk/misc/debian/brlcad-doc-animation.desktop brlcad/trunk/misc/debian/brlcad-doc-mged.desktop brlcad/trunk/misc/debian/brlcad-doc.desktop brlcad/trunk/misc/debian/brlcad-mged.desktop brlcad/trunk/misc/debian/brlcad-rtwizard.desktop Property changes on: brlcad/trunk/misc/debian/brlcad-archer.desktop ___ Added: svn:eol-style + native Property changes on: brlcad/trunk/misc/debian/brlcad-db.desktop ___ Added: svn:eol-style + native Property changes on: brlcad/trunk/misc/debian/brlcad-doc-animation.desktop ___ Modified: svn:mime-type - application/x-desktop + text/plain Added: svn:eol-style + native Property changes on: brlcad/trunk/misc/debian/brlcad-doc-mged.desktop ___ Modified: svn:mime-type - application/x-desktop + text/plain Added: svn:eol-style + native Property changes on: brlcad/trunk/misc/debian/brlcad-doc.desktop ___ Added: svn:eol-style + native Property changes on: brlcad/trunk/misc/debian/brlcad-mged.desktop ___ Added: svn:eol-style + native Property changes on: brlcad/trunk/misc/debian/brlcad-rtwizard.desktop ___ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42838] brlcad/trunk/src/libbn/anim.c
Revision: 42838
http://brlcad.svn.sourceforge.net/brlcad/?rev=42838view=rev
Author: brlcad
Date: 2011-02-01 20:41:53 + (Tue, 01 Feb 2011)
Log Message:
---
VINIT_ZERO instead of {}
Modified Paths:
--
brlcad/trunk/src/libbn/anim.c
Modified: brlcad/trunk/src/libbn/anim.c
===
--- brlcad/trunk/src/libbn/anim.c 2011-02-01 20:32:56 UTC (rev 42837)
+++ brlcad/trunk/src/libbn/anim.c 2011-02-01 20:41:53 UTC (rev 42838)
@@ -693,7 +693,7 @@
anim_steer_mat(mat_t mat, vect_t point, int end)
{
static vect_t p1, p2, p3;
-vect_t dir = {0.0,0.0,0.0};
+vect_t dir = VINIT_ZERO;
static vect_t norm;
static int state = ASM_EMPTY;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42839] brlcad/branches/cmake/src/libfft/CMakeLists.txt
Revision: 42839
http://brlcad.svn.sourceforge.net/brlcad/?rev=42839view=rev
Author: starseeker
Date: 2011-02-01 20:49:47 + (Tue, 01 Feb 2011)
Log Message:
---
Yow - optimized is what kills fft - don't go above 256 until there's a
demonstrated need
Modified Paths:
--
brlcad/branches/cmake/src/libfft/CMakeLists.txt
Modified: brlcad/branches/cmake/src/libfft/CMakeLists.txt
===
--- brlcad/branches/cmake/src/libfft/CMakeLists.txt 2011-02-01 20:41:53 UTC
(rev 42838)
+++ brlcad/branches/cmake/src/libfft/CMakeLists.txt 2011-02-01 20:49:47 UTC
(rev 42839)
@@ -8,7 +8,10 @@
ADD_EXECUTABLE(ifftc ifftc.c ditsplitc.c)
target_link_libraries(ifftc ${M_LIBRARY})
-SET(FFT_NUMLIST 16;32;64;128;256;512;1024)
+# 512 and 1024 are tough in optimized compiles, don't
+# go that high until there's a demonstrated need. Only
+# use in BRL-CAD right now is 256.
+SET(FFT_NUMLIST 16;32;64;128;256)
SET(FFT_GEN_SRCS )
FOREACH(filenum ${FFT_NUMLIST})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42840] brlcad/branches/cmake/src/libtclcad/CMakeLists. txt
Revision: 42840
http://brlcad.svn.sourceforge.net/brlcad/?rev=42840view=rev
Author: starseeker
Date: 2011-02-01 20:52:57 + (Tue, 01 Feb 2011)
Log Message:
---
Make libtclcad strict
Modified Paths:
--
brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
Modified: brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
===
--- brlcad/branches/cmake/src/libtclcad/CMakeLists.txt 2011-02-01 20:49:47 UTC
(rev 42839)
+++ brlcad/branches/cmake/src/libtclcad/CMakeLists.txt 2011-02-01 20:52:57 UTC
(rev 42840)
@@ -31,5 +31,11 @@
FOREACH(xlib ${X11_LIBRARIES})
SET(TCLCAD_XLIBS ${TCLCAD_XLIBS} ${xlib})
ENDFOREACH(xlib ${X11_LIBRARIES})
-BRLCAD_ADDLIB(libtclcad tclcad.c tclcadAutoPath.c tkImgFmtPIX.c ged_obj.c
libged libdm ${TCLCAD_XLIBS} ${X11_Xi_LIB})
+SET(LIBTCLCAD_SRCS
+ tclcad.c
+ tclcadAutoPath.c
+ tkImgFmtPIX.c
+ ged_obj.c
+ )
+BRLCAD_ADDLIB(libtclcad ${LIBTCLCAD_SRCS} libged libdm ${TCLCAD_XLIBS}
${X11_Xi_LIB} STRICT)
SET_TARGET_PROPERTIES(libtclcad PROPERTIES VERSION 19.0.1 SOVERSION 19)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42842] brlcad/trunk/src/liboptical/sh_points.c
Revision: 42842
http://brlcad.svn.sourceforge.net/brlcad/?rev=42842view=rev
Author: starseeker
Date: 2011-02-01 21:03:56 + (Tue, 01 Feb 2011)
Log Message:
---
Hidden causes a warning here about useless storage class specification
Modified Paths:
--
brlcad/trunk/src/liboptical/sh_points.c
Modified: brlcad/trunk/src/liboptical/sh_points.c
===
--- brlcad/trunk/src/liboptical/sh_points.c 2011-02-01 21:01:35 UTC (rev
42841)
+++ brlcad/trunk/src/liboptical/sh_points.c 2011-02-01 21:03:56 UTC (rev
42842)
@@ -70,7 +70,6 @@
};
-HIDDEN
struct points {
fastf_t u; /* u location */
fastf_t v; /* v location */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42843] brlcad/trunk/src/liboptical/sh_text.c
Revision: 42843
http://brlcad.svn.sourceforge.net/brlcad/?rev=42843view=rev
Author: starseeker
Date: 2011-02-01 21:08:36 + (Tue, 01 Feb 2011)
Log Message:
---
Need a little more careful look here, but this removes enough forward decls to
get it building
Modified Paths:
--
brlcad/trunk/src/liboptical/sh_text.c
Modified: brlcad/trunk/src/liboptical/sh_text.c
===
--- brlcad/trunk/src/liboptical/sh_text.c 2011-02-01 21:03:56 UTC (rev
42842)
+++ brlcad/trunk/src/liboptical/sh_text.c 2011-02-01 21:08:36 UTC (rev
42843)
@@ -68,11 +68,8 @@
HIDDEN int bwtxt_render(struct application *ap, struct partition *pp, struct
shadework *swp, char *dp);
HIDDEN int txt_setup(register struct region *rp, struct bu_vls *matparm, char
**dpp, const struct mfuncs *mfp, struct rt_i *rtip), txt_render(struct
application *ap, struct partition *pp, struct shadework *swp, char *dp);
HIDDEN int ckr_setup(register struct region *rp, struct bu_vls *matparm, char
**dpp, struct mfuncs *mfp, struct rt_i *rtip), ckr_render(struct application
*ap, struct partition *pp, register struct shadework *swp, char *dp);
-HIDDEN int bmp_setup(), bmp_render(struct application *ap, struct partition
*pp, struct shadework *swp, char *dp);
-HIDDEN void bwtxtprint(), bwtxtfree();
HIDDEN void txt_print(register struct region *rp), txt_free(char *cp);
HIDDEN void ckr_print(register struct region *rp), ckr_free(char *cp);
-HIDDEN void bmp_print(), bmp_free();
HIDDEN int tstm_render(struct application *ap, struct partition *pp, register
struct shadework *swp, char *dp);
HIDDEN int star_render(register struct application *ap, register struct
partition *pp, struct shadework *swp, char *dp);
HIDDEN int envmap_setup(register struct region *rp, struct bu_vls *matparm,
char **dpp, const struct mfuncs *mfp, struct rt_i *rtip, struct mfuncs **headp);
@@ -80,33 +77,8 @@
extern void mlib_void();
-struct mfuncs txt_mfuncs[] = {
-{MF_MAGIC, texture, 0, MFI_UV, 0,
- txt_setup,txt_render, txt_print, txt_free },
-{MF_MAGIC, bwtexture,0, MFI_UV, 0,
- txt_setup,bwtxt_render, txt_print, txt_free },
-{MF_MAGIC, checker, 0, MFI_UV, 0,
- ckr_setup,ckr_render, ckr_print, ckr_free },
-
-{MF_MAGIC, testmap, 0, MFI_UV, 0,
- mlib_one, tstm_render,mlib_void, mlib_void },
-
-{MF_MAGIC, fakestar, 0, 0, 0,
- mlib_one, star_render,mlib_void, mlib_void },
-
-{MF_MAGIC, bump, 0, MFI_UV|MFI_NORMAL, 0,
- txt_setup,bmp_render, txt_print, txt_free },
-
-{MF_MAGIC, envmap, 0, 0, 0,
- envmap_setup, mlib_zero, mlib_void, mlib_void },
-
-{0,(char *)0, 0, 0, 0,
- 0,0, 0, 0 }
-};
-
-
struct bu_structparse txt_parse[] = {
{%d, 1, transp,bu_offsetofarray(struct txt_specific,
tx_transp), txt_transp_hook, NULL, NULL },
{%V, 1, file, TX_O(tx_name), txt_source_hook, NULL,
NULL },
@@ -1055,7 +1027,33 @@
{
}
+struct mfuncs txt_mfuncs[] = {
+{MF_MAGIC, texture, 0, MFI_UV, 0,
+ txt_setup,txt_render, txt_print, txt_free },
+{MF_MAGIC, bwtexture,0, MFI_UV, 0,
+ txt_setup,bwtxt_render, txt_print, txt_free },
+
+{MF_MAGIC, checker, 0, MFI_UV, 0,
+ ckr_setup,ckr_render, ckr_print, ckr_free },
+
+{MF_MAGIC, testmap, 0, MFI_UV, 0,
+ mlib_one, tstm_render,mlib_void, mlib_void },
+
+{MF_MAGIC, fakestar, 0, 0, 0,
+ mlib_one, star_render,mlib_void, mlib_void },
+
+{MF_MAGIC, bump, 0, MFI_UV|MFI_NORMAL, 0,
+ txt_setup,bmp_render, txt_print, txt_free },
+
+{MF_MAGIC, envmap, 0, 0, 0,
+ envmap_setup, mlib_zero, mlib_void, mlib_void },
+
+{0,(char *)0, 0, 0, 0,
+ 0,0, 0, 0 }
+};
+
+
/*
* Local Variables:
* mode: C
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight
[brlcad-commits] SF.net SVN: brlcad:[42844] brlcad/trunk/src/conv/dem-g.c
Revision: 42844
http://brlcad.svn.sourceforge.net/brlcad/?rev=42844view=rev
Author: starseeker
Date: 2011-02-01 21:09:33 + (Tue, 01 Feb 2011)
Log Message:
---
Compiler doesn't like this inline
Modified Paths:
--
brlcad/trunk/src/conv/dem-g.c
Modified: brlcad/trunk/src/conv/dem-g.c
===
--- brlcad/trunk/src/conv/dem-g.c 2011-02-01 21:08:36 UTC (rev 42843)
+++ brlcad/trunk/src/conv/dem-g.c 2011-02-01 21:09:33 UTC (rev 42844)
@@ -144,7 +144,7 @@
} ResultStruct;
-inline double
+double
round_closest(double x)
{
return (x 0.0) ? floor(x + 0.5) : ceil (x - 0.5);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42845] brlcad/trunk
Revision: 42845
http://brlcad.svn.sourceforge.net/brlcad/?rev=42845view=rev
Author: brlcad
Date: 2011-02-01 21:16:52 + (Tue, 01 Feb 2011)
Log Message:
---
check for GetFullPathName() and conditionalize on HAVE_GETFULLPATHNAME instead
of _WIN32 accordingly
Modified Paths:
--
brlcad/trunk/configure.ac
brlcad/trunk/include/config_win_cmake.h
brlcad/trunk/src/libbu/backtrace.c
brlcad/trunk/src/libbu/brlcad_path.c
Modified: brlcad/trunk/configure.ac
===
--- brlcad/trunk/configure.ac 2011-02-01 21:09:33 UTC (rev 42844)
+++ brlcad/trunk/configure.ac 2011-02-01 21:16:52 UTC (rev 42845)
@@ -2304,6 +2304,7 @@
# mktime, strftime, time
AC_CHECK_FUNCS(\
+ GetFullPathName \
XQueryExtension \
alarm \
dlopen \
Modified: brlcad/trunk/include/config_win_cmake.h
===
--- brlcad/trunk/include/config_win_cmake.h 2011-02-01 21:09:33 UTC (rev
42844)
+++ brlcad/trunk/include/config_win_cmake.h 2011-02-01 21:16:52 UTC (rev
42845)
@@ -61,7 +61,7 @@
#define HAS_OPENGL 1
#define HAVE_FCNTL_H 1
-#define HAVE_PUTENV1
+#define HAVE_GETFULLPATHNAME 1
#define HAVE_GETHOSTNAME 1
#define HAVE_GETPROGNAME1
#define HAVE_GL_GL_H 1
@@ -70,6 +70,7 @@
#define HAVE_MEMSET1
#define HAVE_OFF_T 1
#define HAVE_PROCESS_H 1
+#define HAVE_PUTENV1
#define HAVE_REGEX_H 1
#define HAVE_SIG_T 1
#define HAVE_STRCHR1
@@ -80,8 +81,8 @@
#define HAVE_SYS_TYPES_H 1
#define HAVE_TIME 1
#define HAVE_VFORK 1
+#define HAVE_WINSOCK2_H1
#define HAVE_WINSOCK_H 1
-#define HAVE_WINSOCK2_H1
#define HAVE_SBRK 1
#define sbrk(i) (NULL)
Modified: brlcad/trunk/src/libbu/backtrace.c
===
--- brlcad/trunk/src/libbu/backtrace.c 2011-02-01 21:09:33 UTC (rev 42844)
+++ brlcad/trunk/src/libbu/backtrace.c 2011-02-01 21:16:52 UTC (rev 42845)
@@ -296,19 +296,15 @@
}
/* make sure the debugger exists */
-locate_gdb = bu_which(gdb);
-if (locate_gdb) {
+if ((locate_gdb = bu_which(gdb))) {
debugger_args[0] = bu_strdup(locate_gdb);
if (UNLIKELY(bu_debug BU_DEBUG_BACKTRACE)) {
bu_log(Found gdb in USER path: %s\n, locate_gdb);
}
-} else {
-locate_gdb = bu_whereis(gdb);
- if (locate_gdb) {
- debugger_args[0] = bu_strdup(locate_gdb);
- if (UNLIKELY(bu_debug BU_DEBUG_BACKTRACE)) {
- bu_log(Found gdb in SYSTEM path: %s\n, locate_gdb);
- }
+} else if ((locate_gdb = bu_whereis(gdb))) {
+ debugger_args[0] = bu_strdup(locate_gdb);
+ if (UNLIKELY(bu_debug BU_DEBUG_BACKTRACE)) {
+ bu_log(Found gdb in SYSTEM path: %s\n, locate_gdb);
} else {
if (UNLIKELY(bu_debug BU_DEBUG_BACKTRACE)) {
bu_log(gdb was NOT found, no backtrace available\n);
Modified: brlcad/trunk/src/libbu/brlcad_path.c
===
--- brlcad/trunk/src/libbu/brlcad_path.c2011-02-01 21:09:33 UTC (rev
42844)
+++ brlcad/trunk/src/libbu/brlcad_path.c2011-02-01 21:16:52 UTC (rev
42845)
@@ -470,7 +470,7 @@
bu_strlcpy(real_path, lhs, (size_t)MAXPATHLEN);
}
#else
-# ifdef _WIN32
+# ifdef HAVE_GETFULLPATHNAME
GetFullPathName(lhs, MAXPATHLEN, real_path, NULL);
# else
bu_strlcpy(real_path, lhs, (size_t)MAXPATHLEN);
@@ -580,7 +580,7 @@
bu_strlcpy(result, full_path, (size_t)MAXPATHLEN);
}
#else
-# ifdef _WIN32
+# ifdef HAVE_GETFULLPATHNAME
GetFullPathName(full_path, MAXPATHLEN, result, NULL);
# else
snprintf(result, MAXPATHLEN, %s, full_path);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42847] brlcad/trunk/src/mged/mged.c
Revision: 42847
http://brlcad.svn.sourceforge.net/brlcad/?rev=42847view=rev
Author: brlcad
Date: 2011-02-01 21:29:02 + (Tue, 01 Feb 2011)
Log Message:
---
ERR... really? somehow this commit didn't make it through. give mged the
ability to forcibly flip the version number even if librt doesn't do it
automatically.
Modified Paths:
--
brlcad/trunk/src/mged/mged.c
Modified: brlcad/trunk/src/mged/mged.c
===
--- brlcad/trunk/src/mged/mged.c2011-02-01 21:24:45 UTC (rev 42846)
+++ brlcad/trunk/src/mged/mged.c2011-02-01 21:29:02 UTC (rev 42847)
@@ -2777,11 +2777,16 @@
}
if (flip_v4) {
- if (dbip-dbi_version != 4) {
+ if (db_version(dbip) != 4) {
bu_log(WARNING: [%s] is not a v4 database. The -f option will be
ignored.\n, dbip-dbi_filename);
} else {
- dbip-dbi_version *= -1; /* flip the version number to indicate a
flipped database */
- dbip-dbi_read_only = 1; /* do NOT write to a flipped database */
+ /* flip the version number to indicate a flipped database */
+ if (dbip-dbi_version 0)
+ dbip-dbi_version *= -1;
+
+ /* do NOT write to a flipped database */
+ dbip-dbi_read_only = 1;
+
bu_log(Treating file as a binary-incompatible v4 geometry
database.\n);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42848] brlcad/trunk/src/bwish
Revision: 42848 http://brlcad.svn.sourceforge.net/brlcad/?rev=42848view=rev Author: brlcad Date: 2011-02-01 21:29:31 + (Tue, 01 Feb 2011) Log Message: --- another bio.h inclusion instead of windows.h Modified Paths: -- brlcad/trunk/src/bwish/consoleMain.c brlcad/trunk/src/bwish/winMain.c Modified: brlcad/trunk/src/bwish/consoleMain.c === --- brlcad/trunk/src/bwish/consoleMain.c2011-02-01 21:29:02 UTC (rev 42847) +++ brlcad/trunk/src/bwish/consoleMain.c2011-02-01 21:29:31 UTC (rev 42848) @@ -8,7 +8,7 @@ */ #include tcl.h -#include windows.h +#include bio.h #include locale.h /* Modified: brlcad/trunk/src/bwish/winMain.c === --- brlcad/trunk/src/bwish/winMain.c2011-02-01 21:29:02 UTC (rev 42847) +++ brlcad/trunk/src/bwish/winMain.c2011-02-01 21:29:31 UTC (rev 42848) @@ -36,7 +36,7 @@ #include tkInt.h #define WIN32_LEAN_AND_MEAN -#include windows.h +#include bio.h #undef WIN32_LEAN_AND_MEAN #include locale.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42849] brlcad/branches/bottie
Revision: 42849
http://brlcad.svn.sourceforge.net/brlcad/?rev=42849view=rev
Author: erikgreenwald
Date: 2011-02-01 21:35:17 + (Tue, 01 Feb 2011)
Log Message:
---
mimic rt_bot_minpieces for TIE algorithm
Modified Paths:
--
brlcad/branches/bottie/include/raytrace.h
brlcad/branches/bottie/src/librt/globals.c
brlcad/branches/bottie/src/librt/primitives/bot/bot.c
brlcad/branches/bottie/src/librt/tcl.c
Modified: brlcad/branches/bottie/include/raytrace.h
===
--- brlcad/branches/bottie/include/raytrace.h 2011-02-01 21:29:31 UTC (rev
42848)
+++ brlcad/branches/bottie/include/raytrace.h 2011-02-01 21:35:17 UTC (rev
42849)
@@ -1348,6 +1348,7 @@
/* Used to set globals declared in bot.c */
#define RT_DEFAULT_MINPIECES 32
#define RT_DEFAULT_TRIS_PER_PIECE 4
+#define RT_DEFAULT_MINTIE 0x
/**
* R E S O U R C E
@@ -5930,6 +5931,7 @@
/* defined in bot.c */
RT_EXPORT extern size_t rt_bot_minpieces;
RT_EXPORT extern size_t rt_bot_tri_per_piece;
+RT_EXPORT extern size_t rt_bot_mintie;
RT_EXPORT BU_EXTERN(int rt_bot_sort_faces,
(struct rt_bot_internal *bot,
size_t tris_per_piece));
Modified: brlcad/branches/bottie/src/librt/globals.c
===
--- brlcad/branches/bottie/src/librt/globals.c 2011-02-01 21:29:31 UTC (rev
42848)
+++ brlcad/branches/bottie/src/librt/globals.c 2011-02-01 21:35:17 UTC (rev
42849)
@@ -284,6 +284,11 @@
size_t rt_bot_minpieces = RT_DEFAULT_MINPIECES;
/**
+ * minimum number of bot for TIE
+ */
+size_t rt_bot_mintie = RT_DEFAULT_MINTIE;
+
+/**
* minimum triangles per piece
*/
size_t rt_bot_tri_per_piece = RT_DEFAULT_TRIS_PER_PIECE;
Modified: brlcad/branches/bottie/src/librt/primitives/bot/bot.c
===
--- brlcad/branches/bottie/src/librt/primitives/bot/bot.c 2011-02-01
21:29:31 UTC (rev 42848)
+++ brlcad/branches/bottie/src/librt/primitives/bot/bot.c 2011-02-01
21:35:17 UTC (rev 42849)
@@ -205,7 +205,7 @@
bot_ip = (struct rt_bot_internal *)ip-idb_ptr;
RT_BOT_CK_MAGIC(bot_ip);
-if ( bot_ip-face_normals != NULL || bot_ip-orientation !=
RT_BOT_UNORIENTED )
+if ( bot_ip-num_faces = rt_bot_mintie (bot_ip-face_normals != NULL
|| bot_ip-orientation != RT_BOT_UNORIENTED) )
return bottie_prep_double(stp, bot_ip, rtip);
else if (bot_ip-bot_flags RT_BOT_USE_FLOATS)
return rt_bot_prep_float(stp, bot_ip, rtip);
Modified: brlcad/branches/bottie/src/librt/tcl.c
===
--- brlcad/branches/bottie/src/librt/tcl.c 2011-02-01 21:29:31 UTC (rev
42848)
+++ brlcad/branches/bottie/src/librt/tcl.c 2011-02-01 21:35:17 UTC (rev
42849)
@@ -763,11 +763,14 @@
{
extern size_t rt_bot_minpieces;/* from globals.c */
extern size_t rt_bot_tri_per_piece;/* from globals.c */
+extern size_t rt_bot_mintie; /* from globals.c */
Tcl_LinkVar(interp, rt_bot_minpieces, (char *)rt_bot_minpieces,
TCL_LINK_WIDE_INT);
Tcl_LinkVar(interp, rt_bot_tri_per_piece,
(char *)rt_bot_tri_per_piece, TCL_LINK_WIDE_INT);
+
+Tcl_LinkVar(interp, rt_bot_mintie, (char *)rt_bot_mintie,
TCL_LINK_WIDE_INT);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42850] brlcad/trunk/src/conv/g-vrml.c
Revision: 42850
http://brlcad.svn.sourceforge.net/brlcad/?rev=42850view=rev
Author: starseeker
Date: 2011-02-01 22:09:24 + (Tue, 01 Feb 2011)
Log Message:
---
work around potential clobber in g-vrml
Modified Paths:
--
brlcad/trunk/src/conv/g-vrml.c
Modified: brlcad/trunk/src/conv/g-vrml.c
===
--- brlcad/trunk/src/conv/g-vrml.c 2011-02-01 21:35:17 UTC (rev 42849)
+++ brlcad/trunk/src/conv/g-vrml.c 2011-02-01 22:09:24 UTC (rev 42850)
@@ -721,7 +721,81 @@
return 0;
}
+void
+process_non_light(struct model *m)
+{
+/* static due to libbu exception handling */
+struct nmgregion *reg;
+static struct shell *s;
+static struct shell *next_s;
+static struct faceuse *fu;
+static struct faceuse *next_fu;
+static struct loopuse *lu;
+/* triangulate any faceuses with holes */
+for ( BU_LIST_FOR( reg, nmgregion, m-r_hd ) )
+{
+ NMG_CK_REGION( reg );
+ s = BU_LIST_FIRST( shell, reg-s_hd );
+ while ( BU_LIST_NOT_HEAD( s, reg-s_hd ) )
+ {
+ NMG_CK_SHELL( s );
+ next_s = BU_LIST_PNEXT( shell, s-l );
+ fu = BU_LIST_FIRST( faceuse, s-fu_hd );
+ while ( BU_LIST_NOT_HEAD( fu-l, s-fu_hd ) )
+ {
+ int shell_is_dead=0;
+ int face_is_dead=0;
+
+ NMG_CK_FACEUSE( fu );
+
+ next_fu = BU_LIST_PNEXT( faceuse, fu-l );
+
+ if ( fu-orientation != OT_SAME )
+ {
+ fu = next_fu;
+ continue;
+ }
+
+ /* check if this faceuse has any holes */
+ for ( BU_LIST_FOR( lu, loopuse, fu-lu_hd ) )
+ {
+ NMG_CK_LOOPUSE( lu );
+ if ( lu-orientation == OT_OPPOSITE )
+ {
+ /* this is a hole, so
+* triangulate the faceuse
+*/
+ if ( BU_SETJUMP )
+ {
+ BU_UNSETJUMP;
+ bu_log( A face has failed triangulation!\n );
+ if ( next_fu == fu-fumate_p )
+ next_fu = BU_LIST_PNEXT( faceuse, next_fu-l );
+ if ( nmg_kfu( fu ) )
+ {
+ (void) nmg_ks( s );
+ shell_is_dead = 1;
+ }
+ face_is_dead = 1;
+ }
+ if ( !face_is_dead )
+ nmg_triangulate_fu( fu, tol );
+ BU_UNSETJUMP;
+ break;
+ }
+
+ }
+ if ( shell_is_dead )
+ break;
+ fu = next_fu;
+ }
+ s = next_s;
+ }
+}
+}
+
+
void
nmg_2_vrml(FILE *fp, const struct db_full_path *pathp, struct model *m, struct
mater_info *mater)
{
@@ -938,78 +1012,10 @@
if ( !is_light )
{
- /* static due to libbu exception handling */
- static struct shell *s;
- static struct shell *next_s;
- static struct faceuse *fu;
- static struct faceuse *next_fu;
- static struct loopuse *lu;
-
- /* triangulate any faceuses with holes */
- for ( BU_LIST_FOR( reg, nmgregion, m-r_hd ) )
- {
- NMG_CK_REGION( reg );
- s = BU_LIST_FIRST( shell, reg-s_hd );
- while ( BU_LIST_NOT_HEAD( s, reg-s_hd ) )
- {
- NMG_CK_SHELL( s );
- next_s = BU_LIST_PNEXT( shell, s-l );
- fu = BU_LIST_FIRST( faceuse, s-fu_hd );
- while ( BU_LIST_NOT_HEAD( fu-l, s-fu_hd ) )
- {
- int shell_is_dead=0;
- int face_is_dead=0;
-
- NMG_CK_FACEUSE( fu );
-
- next_fu = BU_LIST_PNEXT( faceuse, fu-l );
-
- if ( fu-orientation != OT_SAME )
- {
- fu = next_fu;
- continue;
- }
-
- /* check if this faceuse has any holes */
- for ( BU_LIST_FOR( lu, loopuse, fu-lu_hd ) )
- {
- NMG_CK_LOOPUSE( lu );
- if ( lu-orientation == OT_OPPOSITE )
- {
- /* this is a hole, so
-* triangulate the faceuse
-*/
- if ( BU_SETJUMP )
- {
- BU_UNSETJUMP;
- bu_log( A face has failed triangulation!\n );
- if ( next_fu == fu-fumate_p )
- next_fu =
[brlcad-commits] SF.net SVN: brlcad:[42851] brlcad/trunk/src/conv/g-x3d.c
Revision: 42851
http://brlcad.svn.sourceforge.net/brlcad/?rev=42851view=rev
Author: starseeker
Date: 2011-02-01 22:13:35 + (Tue, 01 Feb 2011)
Log Message:
---
Same issue with g-x3d
Modified Paths:
--
brlcad/trunk/src/conv/g-x3d.c
Modified: brlcad/trunk/src/conv/g-x3d.c
===
--- brlcad/trunk/src/conv/g-x3d.c 2011-02-01 22:09:24 UTC (rev 42850)
+++ brlcad/trunk/src/conv/g-x3d.c 2011-02-01 22:13:35 UTC (rev 42851)
@@ -535,6 +535,79 @@
}
void
+process_non_light(struct model *m) {
+struct nmgregion *reg;
+/* static due to bu exception handling */
+static struct shell *s;
+static struct shell *next_s;
+static struct faceuse *fu;
+static struct faceuse *next_fu;
+static struct loopuse *lu;
+
+/* triangulate any faceuses with holes */
+for ( BU_LIST_FOR( reg, nmgregion, m-r_hd ) )
+{
+ NMG_CK_REGION( reg );
+ s = BU_LIST_FIRST( shell, reg-s_hd );
+ while ( BU_LIST_NOT_HEAD( s, reg-s_hd ) )
+ {
+ NMG_CK_SHELL( s );
+ next_s = BU_LIST_PNEXT( shell, s-l );
+ fu = BU_LIST_FIRST( faceuse, s-fu_hd );
+ while ( BU_LIST_NOT_HEAD( fu-l, s-fu_hd ) )
+ {
+ int shell_is_dead=0;
+ int face_is_dead=0;
+
+ NMG_CK_FACEUSE( fu );
+
+ next_fu = BU_LIST_PNEXT( faceuse, fu-l );
+
+ if ( fu-orientation != OT_SAME )
+ {
+ fu = next_fu;
+ continue;
+ }
+
+ /* check if this faceuse has any holes */
+ for ( BU_LIST_FOR( lu, loopuse, fu-lu_hd ) )
+ {
+ NMG_CK_LOOPUSE( lu );
+ if ( lu-orientation == OT_OPPOSITE )
+ {
+ /* this is a hole, so
+* triangulate the faceuse
+*/
+ if ( BU_SETJUMP )
+ {
+ BU_UNSETJUMP;
+ bu_log( A face has failed triangulation!\n );
+ if ( next_fu == fu-fumate_p )
+ next_fu = BU_LIST_PNEXT( faceuse, next_fu-l );
+ if ( nmg_kfu( fu ) )
+ {
+ (void) nmg_ks( s );
+ shell_is_dead = 1;
+ }
+ face_is_dead = 1;
+ }
+ if ( !face_is_dead )
+ nmg_triangulate_fu( fu, tol );
+ BU_UNSETJUMP;
+ break;
+ }
+
+ }
+ if ( shell_is_dead )
+ break;
+ fu = next_fu;
+ }
+ s = next_s;
+ }
+}
+}
+
+void
nmg_2_vrml(FILE *fp, const struct db_full_path *pathp, struct model *m, struct
mater_info *mater)
{
struct nmgregion *reg;
@@ -671,74 +744,7 @@
if ( !is_light )
{
- /* static due to bu exception handling */
- static struct shell *s;
- static struct shell *next_s;
- static struct faceuse *fu;
- static struct faceuse *next_fu;
- static struct loopuse *lu;
-
- /* triangulate any faceuses with holes */
- for ( BU_LIST_FOR( reg, nmgregion, m-r_hd ) )
- {
- NMG_CK_REGION( reg );
- s = BU_LIST_FIRST( shell, reg-s_hd );
- while ( BU_LIST_NOT_HEAD( s, reg-s_hd ) )
- {
- NMG_CK_SHELL( s );
- next_s = BU_LIST_PNEXT( shell, s-l );
- fu = BU_LIST_FIRST( faceuse, s-fu_hd );
- while ( BU_LIST_NOT_HEAD( fu-l, s-fu_hd ) )
- {
- int shell_is_dead=0;
- int face_is_dead=0;
-
- NMG_CK_FACEUSE( fu );
-
- next_fu = BU_LIST_PNEXT( faceuse, fu-l );
-
- if ( fu-orientation != OT_SAME )
- {
- fu = next_fu;
- continue;
- }
-
- /* check if this faceuse has any holes */
- for ( BU_LIST_FOR( lu, loopuse, fu-lu_hd ) )
- {
- NMG_CK_LOOPUSE( lu );
- if ( lu-orientation == OT_OPPOSITE )
- {
- /* this is a hole, so
-* triangulate the faceuse
-*/
- if ( BU_SETJUMP )
- {
- BU_UNSETJUMP;
- bu_log( A face has failed triangulation!\n );
- if ( next_fu == fu-fumate_p )
- next_fu = BU_LIST_PNEXT( faceuse,
[brlcad-commits] SF.net SVN: brlcad:[42852] brlcad/trunk/src/libdm
Revision: 42852
http://brlcad.svn.sourceforge.net/brlcad/?rev=42852view=rev
Author: starseeker
Date: 2011-02-01 22:26:18 + (Tue, 01 Feb 2011)
Log Message:
---
reorder to remove forward declarations
Modified Paths:
--
brlcad/trunk/src/libdm/dm-plot.c
brlcad/trunk/src/libdm/dm-ps.c
brlcad/trunk/src/libdm/dm-tk.c
Modified: brlcad/trunk/src/libdm/dm-plot.c
===
--- brlcad/trunk/src/libdm/dm-plot.c2011-02-01 22:13:35 UTC (rev 42851)
+++ brlcad/trunk/src/libdm/dm-plot.c2011-02-01 22:26:18 UTC (rev 42852)
@@ -56,215 +56,10 @@
#define PLOTBOUND 1000.0 /* Max magnification in Rot matrix */
-HIDDEN_DM_FUNCTION_PROTOTYPES(plot)
-
-struct dm dm_plot = {
-plot_close,
-plot_drawBegin,
-plot_drawEnd,
-plot_normal,
-plot_loadMatrix,
-plot_drawString2D,
-plot_drawLine2D,
-plot_drawLine3D,
-plot_drawLines3D,
-plot_drawPoint2D,
-plot_drawVList,
-plot_drawVList,
-plot_draw,
-plot_setFGColor,
-plot_setBGColor,
-plot_setLineAttr,
-Nu_int0,
-plot_setWinBounds,
-Nu_int0,
-Nu_int0,
-Nu_int0,
-Nu_int0,
-plot_debug,
-Nu_int0,
-Nu_int0,
-Nu_int0,
-Nu_int0,
-Nu_int0, /* display to image function */
-0,
-0, /* no displaylist */
-0, /* no stereo */
-PLOTBOUND, /* zoom-in limit */
-1, /* bound flag */
-plot,
-Screen to UNIX-Plot,
-DM_TYPE_PLOT,
-0,
-0,
-0,
-0,/* bytes per pixel */
-0,/* bits per channel */
-0,
-0,
-1.0, /* aspect ratio */
-0,
-{0, 0},
-{0, 0, 0, 0, 0}, /* bu_vls path name*/
-{0, 0, 0, 0, 0}, /* bu_vls full name drawing window */
-{0, 0, 0, 0, 0}, /* bu_vls short name drawing window */
-{0, 0, 0}, /* bg color */
-{0, 0, 0}, /* fg color */
-{0.0, 0.0, 0.0}, /* clipmin */
-{0.0, 0.0, 0.0}, /* clipmax */
-0, /* no debugging */
-0, /* no perspective */
-0, /* no lighting */
-0, /* no transparency */
-0, /* depth buffer is not writable */
-0, /* no zbuffer */
-0, /* no zclipping */
-1, /* clear back buffer after drawing and swap */
-0, /* not overriding the auto font size */
-0 /* Tcl interpreter */
-};
-
-
struct plot_vars head_plot_vars;
static mat_t plotmat;
-/*
- * P L O T _ O P E N
- *
- * Fire up the display manager, and the display processor.
- *
- */
-struct dm *
-plot_open(Tcl_Interp *interp, int argc, const char *argv[])
-{
-static int count = 0;
-struct dm *dmp;
-Tcl_Obj *obj;
-BU_GETSTRUCT(dmp, dm);
-if (dmp == DM_NULL)
- return DM_NULL;
-
-*dmp = dm_plot; /* struct copy */
-dmp-dm_interp = interp;
-
-dmp-dm_vars.priv_vars = (genptr_t)bu_calloc(1, sizeof(struct plot_vars),
plot_open: plot_vars);
-BU_GETSTRUCT(dmp-dm_vars.priv_vars, plot_vars);
-if (dmp-dm_vars.priv_vars == (genptr_t)NULL) {
- bu_free((genptr_t)dmp, plot_open: dmp);
- return DM_NULL;
-}
-
-obj = Tcl_GetObjResult(interp);
-if (Tcl_IsShared(obj))
- obj = Tcl_DuplicateObj(obj);
-
-bu_vls_init(((struct plot_vars *)dmp-dm_vars.priv_vars)-vls);
-bu_vls_init(dmp-dm_pathName);
-bu_vls_init(dmp-dm_tkName);
-bu_vls_printf(dmp-dm_pathName, .dm_plot%d, count++);
-bu_vls_printf(dmp-dm_tkName, dm_plot%d, count++);
-
-/* skip first argument */
---argc; ++argv;
-
-/* Process any options */
-((struct plot_vars *)dmp-dm_vars.priv_vars)-is_3D = 1; /* 3-D
w/color, by default */
-while (argv[0] != (char *)0 argv[0][0] == '-') {
- switch (argv[0][1]) {
- case '3':
- break;
- case '2':
- ((struct plot_vars *)dmp-dm_vars.priv_vars)-is_3D = 0;
/* 2-D, for portability */
- break;
- case 'g':
- ((struct plot_vars *)dmp-dm_vars.priv_vars)-grid = 1;
- break;
- case 'f':
- ((struct plot_vars *)dmp-dm_vars.priv_vars)-floating = 1;
- break;
- case 'z':
- case 'Z':
- /* Enable Z clipping */
- Tcl_AppendStringsToObj(obj, Clipped in Z to viewing cube\n,
(char *)NULL);
-#if 0
- ((struct plot_vars *)dmp-dm_vars.priv_vars)-zclip = 1;
-#else
- dmp-dm_zclip = 1;
-#endif
- break;
- default:
- Tcl_AppendStringsToObj(obj, bad PLOT option , argv[0], \n,
(char *)NULL);
-
[brlcad-commits] SF.net SVN: brlcad:[42853] brlcad/branches/cmake/misc/CMake/BRLCAD_Util. cmake
Revision: 42853
http://brlcad.svn.sourceforge.net/brlcad/?rev=42853view=rev
Author: starseeker
Date: 2011-02-01 22:39:28 + (Tue, 01 Feb 2011)
Log Message:
---
Turn off Werror when we see cpp files in a strict library, unless CXX_STRICT is
on. Leave the warnings unless the warnings option is off.
Modified Paths:
--
brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
Modified: brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
===
--- brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2011-02-01 22:26:18 UTC
(rev 42852)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2011-02-01 22:39:28 UTC
(rev 42853)
@@ -37,6 +37,17 @@
FOREACH(extraarg ${ARGN})
IF(${extraarg} MATCHES STRICT AND BRLCAD-ENABLE_STRICT)
SET(LOCAL_COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS}
${STRICT_FLAGS})
+ IF(NOT BRLCAD-ENABLE_CXX_STRICT)
+ FOREACH(srcfile ${srcslist})
+ IF(${srcfile} MATCHES cpp$)
+ IF(BRLCAD-ENABLE_COMPILER_WARNINGS)
+
set_source_files_properties(${srcfile} COMPILE_FLAGS -Wno-error)
+ ELSE(BRLCAD-ENABLE_COMPILER_WARNINGS)
+
set_source_files_properties(${srcfile} COMPILE_FLAGS -w)
+ ENDIF(BRLCAD-ENABLE_COMPILER_WARNINGS)
+ ENDIF(${srcfile} MATCHES cpp$)
+ ENDFOREACH(srcfile ${srcslist})
+ ENDIF(NOT BRLCAD-ENABLE_CXX_STRICT)
ENDIF(${extraarg} MATCHES STRICT AND BRLCAD-ENABLE_STRICT)
ENDFOREACH(extraarg ${ARGN})
IF(LOCAL_COMPILE_FLAGS)
@@ -80,6 +91,17 @@
FOREACH(extraarg ${ARGN})
IF(${extraarg} MATCHES STRICT AND BRLCAD-ENABLE_STRICT)
SET(LOCAL_COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS}
${STRICT_FLAGS})
+ IF(NOT BRLCAD-ENABLE_CXX_STRICT)
+ FOREACH(srcfile ${srcslist})
+ IF(${srcfile} MATCHES cpp$)
+ IF(BRLCAD-ENABLE_COMPILER_WARNINGS)
+
set_source_files_properties(${srcfile} COMPILE_FLAGS -Wno-error)
+ ELSE(BRLCAD-ENABLE_COMPILER_WARNINGS)
+
set_source_files_properties(${srcfile} COMPILE_FLAGS -w)
+ ENDIF(BRLCAD-ENABLE_COMPILER_WARNINGS)
+ ENDIF(${srcfile} MATCHES cpp$)
+ ENDFOREACH(srcfile ${srcslist})
+ ENDIF(NOT BRLCAD-ENABLE_CXX_STRICT)
ENDIF(${extraarg} MATCHES STRICT AND BRLCAD-ENABLE_STRICT)
ENDFOREACH(extraarg ${ARGN})
IF(LOCAL_COMPILE_FLAGS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42854] brlcad/branches/cmake/CMakeLists.txt
Revision: 42854
http://brlcad.svn.sourceforge.net/brlcad/?rev=42854view=rev
Author: starseeker
Date: 2011-02-01 22:42:18 + (Tue, 01 Feb 2011)
Log Message:
---
Add the BRLCAD-ENABLE_CXX_STRICT option
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-02-01 22:39:28 UTC (rev
42853)
+++ brlcad/branches/cmake/CMakeLists.txt2011-02-01 22:42:18 UTC (rev
42854)
@@ -679,8 +679,10 @@
# Enable/disable strict compiler settings - these are limited to libraries that
# specifically inform the BRLCAD_ADDLIB macro they can be built with STRICT
flags.
OPTION(BRLCAD-ENABLE_STRICT Use strict compiler settings on libraries that
support them ON)
+OPTION(BRLCAD-ENABLE_CXX_STRICT Use strict compiler settings on cxx files in
libraries that build with strict OFF)
+if (BRLCAD-ENABLE_STRICT)
MARK_AS_ADVANCED(BRLCAD-ENABLE_STRICT)
-if (BRLCAD-ENABLE_STRICT)
+MARK_AS_ADVANCED(BRLCAD-ENABLE_CXX_STRICT)
FILE(APPEND ${CONFIG_H_FILE} #define STRICT_FLAGS 1\n)
endif (BRLCAD-ENABLE_STRICT)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42855] brlcad/trunk/src/mged/mged.c
Revision: 42855
http://brlcad.svn.sourceforge.net/brlcad/?rev=42855view=rev
Author: brlcad
Date: 2011-02-01 22:44:16 + (Tue, 01 Feb 2011)
Log Message:
---
tweak the message to let the user know whether -f had any affect. only mark as
read-only and flip if we need to.
Modified Paths:
--
brlcad/trunk/src/mged/mged.c
Modified: brlcad/trunk/src/mged/mged.c
===
--- brlcad/trunk/src/mged/mged.c2011-02-01 22:42:18 UTC (rev 42854)
+++ brlcad/trunk/src/mged/mged.c2011-02-01 22:44:16 UTC (rev 42855)
@@ -2780,14 +2780,17 @@
if (db_version(dbip) != 4) {
bu_log(WARNING: [%s] is not a v4 database. The -f option will be
ignored.\n, dbip-dbi_filename);
} else {
- /* flip the version number to indicate a flipped database */
- if (dbip-dbi_version 0)
+ if (dbip-dbi_version 0) {
+ bu_log(Database [%s] was already (perhaps automatically)
flipped, -f is redundant.\n, dbip-dbi_filename);
+ } else {
+ bu_log(Treating [%s] as a binary-incompatible v4 geometry
database.\n, dbip-dbip_filename);
+
+ /* flip the version number to indicate a flipped database. */
dbip-dbi_version *= -1;
- /* do NOT write to a flipped database */
- dbip-dbi_read_only = 1;
-
- bu_log(Treating file as a binary-incompatible v4 geometry
database.\n);
+ /* do NOT write to a flipped database */
+ dbip-dbi_read_only = 1;
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42856] brlcad/trunk/src
Revision: 42856
http://brlcad.svn.sourceforge.net/brlcad/?rev=42856view=rev
Author: starseeker
Date: 2011-02-01 22:45:02 + (Tue, 01 Feb 2011)
Log Message:
---
Few misc tweaks - turn off some unused libged code, UNUSED in brep.cpp
Modified Paths:
--
brlcad/trunk/src/libged/bigE.c
brlcad/trunk/src/libged/human.c
brlcad/trunk/src/libged/wdb_bigE.c
brlcad/trunk/src/librt/primitives/brep/brep.cpp
Modified: brlcad/trunk/src/libged/bigE.c
===
--- brlcad/trunk/src/libged/bigE.c 2011-02-01 22:44:16 UTC (rev 42855)
+++ brlcad/trunk/src/libged/bigE.c 2011-02-01 22:45:02 UTC (rev 42856)
@@ -447,6 +447,7 @@
/* perform the union of two segments the types of A and B should be
* the same
*/
+#if 0
HIDDEN void
do_union(struct seg *A,
struct seg *B,
@@ -486,6 +487,7 @@
BU_LIST_INSERT(seghead, tmp-l);
}
+#endif
HIDDEN void
promote_ints(struct bu_list *head,
Modified: brlcad/trunk/src/libged/human.c
===
--- brlcad/trunk/src/libged/human.c 2011-02-01 22:44:16 UTC (rev 42855)
+++ brlcad/trunk/src/libged/human.c 2011-02-01 22:45:02 UTC (rev 42856)
@@ -256,7 +256,7 @@
return *rotMatrix;
}
-
+#if 0
HIDDEN void
vectorTest(struct rt_wdb *file)
{
@@ -292,6 +292,7 @@
w = y*y;
return sqrt(v + w);
}
+#endif
/**
@@ -1523,7 +1524,7 @@
bu_log(Height=%lf\n, dude-height);
}
-
+#if 0
/**
* Goes through the human struct and sets all measurements to needed
* measurements, i.e. if certain percentile person is needed, those
@@ -1541,7 +1542,6 @@
bu_log(Setting %.0f percentile data\n, percentile);
/* Find a method of database storage first, then apply those values to
here */
-/*
dude-head.headSize=
dude-head.neckLength=
dude-head.neckWidth=
@@ -1575,10 +1575,9 @@
dude-legs.legLength=dude-legs.thighLength + dude-legs.calfLength;
dude.height=(dude-torso.torsoLength + dude-legs.legLength +
dude-head.headSize);
-*/
}
+#endif
-
/**
* Help message printed when -h/-? option is supplied
*/
Modified: brlcad/trunk/src/libged/wdb_bigE.c
===
--- brlcad/trunk/src/libged/wdb_bigE.c 2011-02-01 22:44:16 UTC (rev 42855)
+++ brlcad/trunk/src/libged/wdb_bigE.c 2011-02-01 22:45:02 UTC (rev 42856)
@@ -459,52 +459,7 @@
}
}
-
-/* perform the union of two segments
- * the types of A and B should be the same
- */
HIDDEN void
-wdb_do_union(struct seg *A,
-struct seg *B,
-struct bu_list *seghead,
-struct dg_client_data *dgcdp)
-{
-struct seg *tmp;
-
-RT_GET_SEG(tmp, dgcdp-ap-a_resource);
-
-if (NOT_SEG_OVERLAP(A, B)) {
- if (A-seg_in.hit_dist = B-seg_in.hit_dist) {
- *tmp = *A;
- BU_LIST_INSERT(seghead, tmp-l);
- RT_GET_SEG(tmp, dgcdp-ap-a_resource);
- *tmp = *B;
- BU_LIST_INSERT(seghead, tmp-l);
- } else {
- *tmp = *B;
- BU_LIST_INSERT(seghead, tmp-l);
- RT_GET_SEG(tmp, dgcdp-ap-a_resource);
- *tmp = *A;
- BU_LIST_INSERT(seghead, tmp-l);
- }
- return;
-}
-
-if (A-seg_in.hit_dist = B-seg_in.hit_dist) {
- *tmp = *A;
- if (B-seg_out.hit_dist A-seg_out.hit_dist)
- tmp-seg_out.hit_dist = B-seg_out.hit_dist;
-} else {
- *tmp = *B;
- if (A-seg_out.hit_dist B-seg_out.hit_dist)
- tmp-seg_out.hit_dist = B-seg_out.hit_dist;
-}
-
-BU_LIST_INSERT(seghead, tmp-l);
-}
-
-
-HIDDEN void
wdb_promote_ints(struct bu_list *head,
struct dg_client_data *dgcdp)
{
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2011-02-01 22:44:16 UTC
(rev 42855)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2011-02-01 22:45:02 UTC
(rev 42856)
@@ -534,7 +534,7 @@
void
-brep_r(const ON_Surface* surf, plane_ray pr, pt2d_t uv, ON_3dPoint pt,
ON_3dVector su, ON_3dVector sv, pt2d_t R)
+brep_r(const ON_Surface* UNUSED(surf), plane_ray pr, pt2d_t UNUSED(uv),
ON_3dPoint pt, ON_3dVector UNUSED(su), ON_3dVector UNUSED(sv), pt2d_t R)
{
assert(surf-Ev1Der(uv[0], uv[1], pt, su, sv));
R[0] = VDOT(pr.n1, ((fastf_t*)pt)) - pr.d1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
[brlcad-commits] SF.net SVN: brlcad:[42859] brlcad/trunk/src/libtclcad/ged_obj.c
Revision: 42859 http://brlcad.svn.sourceforge.net/brlcad/?rev=42859view=rev Author: starseeker Date: 2011-02-01 22:48:59 + (Tue, 01 Feb 2011) Log Message: --- not defined Modified Paths: -- brlcad/trunk/src/libtclcad/ged_obj.c Modified: brlcad/trunk/src/libtclcad/ged_obj.c === --- brlcad/trunk/src/libtclcad/ged_obj.c2011-02-01 22:46:45 UTC (rev 42858) +++ brlcad/trunk/src/libtclcad/ged_obj.c2011-02-01 22:48:59 UTC (rev 42859) @@ -317,12 +317,6 @@ ged_func_ptr func, const char *usage, int maxargs); -HIDDEN int go_mouse_translate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); HIDDEN int go_mouse_ray(struct ged *gedp, int argc, const char *argv[], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42860] brlcad/branches/cmake/src/bwish
Revision: 42860 http://brlcad.svn.sourceforge.net/brlcad/?rev=42860view=rev Author: starseeker Date: 2011-02-01 22:49:51 + (Tue, 01 Feb 2011) Log Message: --- More fixes from trunk Modified Paths: -- brlcad/branches/cmake/src/bwish/consoleMain.c brlcad/branches/cmake/src/bwish/winMain.c Modified: brlcad/branches/cmake/src/bwish/consoleMain.c === --- brlcad/branches/cmake/src/bwish/consoleMain.c 2011-02-01 22:48:59 UTC (rev 42859) +++ brlcad/branches/cmake/src/bwish/consoleMain.c 2011-02-01 22:49:51 UTC (rev 42860) @@ -8,7 +8,7 @@ */ #include tcl.h -#include windows.h +#include bio.h #include locale.h /* Modified: brlcad/branches/cmake/src/bwish/winMain.c === --- brlcad/branches/cmake/src/bwish/winMain.c 2011-02-01 22:48:59 UTC (rev 42859) +++ brlcad/branches/cmake/src/bwish/winMain.c 2011-02-01 22:49:51 UTC (rev 42860) @@ -36,7 +36,7 @@ #include tkInt.h #define WIN32_LEAN_AND_MEAN -#include windows.h +#include bio.h #undef WIN32_LEAN_AND_MEAN #include locale.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42861] brlcad/branches/cmake/src/libtclcad/ged_obj.c
Revision: 42861 http://brlcad.svn.sourceforge.net/brlcad/?rev=42861view=rev Author: starseeker Date: 2011-02-01 22:50:21 + (Tue, 01 Feb 2011) Log Message: --- remove this on cmake branch too Modified Paths: -- brlcad/branches/cmake/src/libtclcad/ged_obj.c Modified: brlcad/branches/cmake/src/libtclcad/ged_obj.c === --- brlcad/branches/cmake/src/libtclcad/ged_obj.c 2011-02-01 22:49:51 UTC (rev 42860) +++ brlcad/branches/cmake/src/libtclcad/ged_obj.c 2011-02-01 22:50:21 UTC (rev 42861) @@ -317,12 +317,6 @@ ged_func_ptr func, const char *usage, int maxargs); -HIDDEN int go_mouse_translate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); HIDDEN int go_mouse_ray(struct ged *gedp, int argc, const char *argv[], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42862] brlcad/branches/cmake/src/mged/mged.c
Revision: 42862
http://brlcad.svn.sourceforge.net/brlcad/?rev=42862view=rev
Author: starseeker
Date: 2011-02-01 22:51:42 + (Tue, 01 Feb 2011)
Log Message:
---
update from trunk
Modified Paths:
--
brlcad/branches/cmake/src/mged/mged.c
Modified: brlcad/branches/cmake/src/mged/mged.c
===
--- brlcad/branches/cmake/src/mged/mged.c 2011-02-01 22:50:21 UTC (rev
42861)
+++ brlcad/branches/cmake/src/mged/mged.c 2011-02-01 22:51:42 UTC (rev
42862)
@@ -2777,11 +2777,16 @@
}
if (flip_v4) {
- if (dbip-dbi_version != 4) {
+ if (db_version(dbip) != 4) {
bu_log(WARNING: [%s] is not a v4 database. The -f option will be
ignored.\n, dbip-dbi_filename);
} else {
- dbip-dbi_version *= -1; /* flip the version number to indicate a
flipped database */
- dbip-dbi_read_only = 1; /* do NOT write to a flipped database */
+ /* flip the version number to indicate a flipped database */
+ if (dbip-dbi_version 0)
+ dbip-dbi_version *= -1;
+
+ /* do NOT write to a flipped database */
+ dbip-dbi_read_only = 1;
+
bu_log(Treating file as a binary-incompatible v4 geometry
database.\n);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42863] brlcad/trunk/src/libged
Revision: 42863
http://brlcad.svn.sourceforge.net/brlcad/?rev=42863view=rev
Author: starseeker
Date: 2011-02-01 22:56:50 + (Tue, 01 Feb 2011)
Log Message:
---
Go ahead and remove the code from libged, instead of commenting itout
Modified Paths:
--
brlcad/trunk/src/libged/bigE.c
brlcad/trunk/src/libged/human.c
Modified: brlcad/trunk/src/libged/bigE.c
===
--- brlcad/trunk/src/libged/bigE.c 2011-02-01 22:51:42 UTC (rev 42862)
+++ brlcad/trunk/src/libged/bigE.c 2011-02-01 22:56:50 UTC (rev 42863)
@@ -444,52 +444,7 @@
}
}
-/* perform the union of two segments the types of A and B should be
- * the same
- */
-#if 0
HIDDEN void
-do_union(struct seg *A,
-struct seg *B,
-struct bu_list *seghead,
-struct _ged_client_data *dgcdp)
-{
-struct seg *tmp;
-
-RT_GET_SEG(tmp, dgcdp-ap-a_resource)
-
- if (NOT_SEG_OVERLAP(A, B)) {
- if (A-seg_in.hit_dist = B-seg_in.hit_dist) {
- *tmp = *A;
- BU_LIST_INSERT(seghead, tmp-l);
- RT_GET_SEG(tmp, dgcdp-ap-a_resource);
- *tmp = *B;
- BU_LIST_INSERT(seghead, tmp-l);
- } else {
- *tmp = *B;
- BU_LIST_INSERT(seghead, tmp-l);
- RT_GET_SEG(tmp, dgcdp-ap-a_resource);
- *tmp = *A;
- BU_LIST_INSERT(seghead, tmp-l);
- }
- return;
- }
-
-if (A-seg_in.hit_dist = B-seg_in.hit_dist) {
- *tmp = *A;
- if (B-seg_out.hit_dist A-seg_out.hit_dist)
- tmp-seg_out.hit_dist = B-seg_out.hit_dist;
-} else {
- *tmp = *B;
- if (A-seg_out.hit_dist B-seg_out.hit_dist)
- tmp-seg_out.hit_dist = B-seg_out.hit_dist;
-}
-
-BU_LIST_INSERT(seghead, tmp-l);
-}
-#endif
-
-HIDDEN void
promote_ints(struct bu_list *head,
struct _ged_client_data *dgcdp)
{
Modified: brlcad/trunk/src/libged/human.c
===
--- brlcad/trunk/src/libged/human.c 2011-02-01 22:51:42 UTC (rev 42862)
+++ brlcad/trunk/src/libged/human.c 2011-02-01 22:56:50 UTC (rev 42863)
@@ -256,45 +256,6 @@
return *rotMatrix;
}
-#if 0
-HIDDEN void
-vectorTest(struct rt_wdb *file)
-{
-/*
- * This code here takes a direction vector, and then redirects it based on
the angles given
- * so it is as follows : startingVector, resultVector, xdegrees, ydegrees,
zdegrees.
- * and this will be used to position the arms and legs so they are joined
yet flexable.
- * Just a test with an rcc.
- */
-
-/*Vector shape modifying test */
-vect_t test1, test2;
-point_t testpoint;
-mat_t rotMatrix;
-VSET(testpoint, 0.0, 0.0, 0.0);
-VSET(test1, 0, 0, 200);
-setDirection(test1, test2, rotMatrix, 0, 90, 0);
-bu_log(%f, %f, %f\n, test1[X], test1[Y], test1[Z]);
-bu_log(%f, %f, %f\n, test2[X], test2[Y], test2[Z]);
-mk_rcc(file, NormalTest.s, testpoint, test1, (5*IN2MM));
-mk_rcc(file, ChangeTest.s, testpoint, test2, (5*IN2MM));
-/* See, now wasn't that easy? */
-}
-
-
-/* Find the hypotenuse of 2 lengths / length vectors */
-HIDDEN fastf_t
-findVector(fastf_t x, fastf_t y)
-{
-fastf_t w;
-fastf_t v;
-v = x*x;
-w = y*y;
-return sqrt(v + w);
-}
-#endif
-
-
/**
* Create a bounding box around the individual part, this one has only
* 1 value for depth and width. Currently is a big mess, as the boxes
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42864] brlcad/trunk/src
Revision: 42864
http://brlcad.svn.sourceforge.net/brlcad/?rev=42864view=rev
Author: starseeker
Date: 2011-02-01 23:00:38 + (Tue, 01 Feb 2011)
Log Message:
---
Let's try this again - see if we can do without tclcad_tcl_library. Using
private Tcl functions is Not Good, particularly when it's for debug printing.
also removing the found_init_tcl call to TclSetLibraryPath - same basic problem
and the comment says it doesn't do what we might expect it to anyway.
Modified Paths:
--
brlcad/trunk/src/bwish/main.c
brlcad/trunk/src/gtools/g_diff.c
brlcad/trunk/src/libtclcad/tclcadAutoPath.c
brlcad/trunk/src/mged/setup.c
Modified: brlcad/trunk/src/bwish/main.c
===
--- brlcad/trunk/src/bwish/main.c 2011-02-01 22:56:50 UTC (rev 42863)
+++ brlcad/trunk/src/bwish/main.c 2011-02-01 23:00:38 UTC (rev 42864)
@@ -99,11 +99,6 @@
}
init_tcl=0;
- /* warn if tcl_library isn't set by now */
- if (try_auto_path) {
- tclcad_tcl_library(interp);
- }
-
#ifdef BWISH
/* Initialize Tk */
Tcl_ResetResult(interp);
Modified: brlcad/trunk/src/gtools/g_diff.c
===
--- brlcad/trunk/src/gtools/g_diff.c2011-02-01 22:56:50 UTC (rev 42863)
+++ brlcad/trunk/src/gtools/g_diff.c2011-02-01 23:00:38 UTC (rev 42864)
@@ -950,7 +950,6 @@
Tcl_FindExecutable(argv[0]);
interp = Tcl_CreateInterp();
tclcad_auto_path(interp);
-tclcad_tcl_library(interp);
if (Tcl_Init(interp) == TCL_ERROR) {
bu_log(Tcl_Init failure:\n%s\n, Tcl_GetStringResult(interp));
Modified: brlcad/trunk/src/libtclcad/tclcadAutoPath.c
===
--- brlcad/trunk/src/libtclcad/tclcadAutoPath.c 2011-02-01 22:56:50 UTC (rev
42863)
+++ brlcad/trunk/src/libtclcad/tclcadAutoPath.c 2011-02-01 23:00:38 UTC (rev
42864)
@@ -94,69 +94,7 @@
return NULL;
}
-
/**
- * debug printing routine for printing out the tcl_library value(s)
- */
-void
-tclcad_tcl_library(Tcl_Interp *interp)
-{
-int cnt = 0;
-int pathcount = 0;
-Tcl_Obj *dir = NULL;
-Tcl_Obj *tclpath = NULL;
-char buffer[MAX_BUF] = {0};
-
-/* FIXME: this is a private internal call */
-tclpath = TclGetLibraryPath();
-if (!tclpath) {
- bu_log(WARNING: Unable to get the library path\n);
- return;
-}
-
-Tcl_IncrRefCount(tclpath);
-Tcl_ListObjLength(NULL, tclpath, pathcount);
-if (pathcount 1) {
- bu_log(WARNING: tcl_library is set to multiple paths?\n);
-} else if (pathcount = 0) {
- if (interp) {
- const char *setting;
- snprintf(buffer, MAX_BUF, set tcl_library);
- Tcl_Eval(interp, buffer);
- setting = Tcl_GetStringResult(interp);
- if (setting (strlen(setting) 0)) {
- Tcl_Obj *tcllib = Tcl_NewStringObj(setting, -1);
- Tcl_Obj *listtl = Tcl_NewListObj(1, tcllib);
- TclSetLibraryPath(listtl);
- }
- }
-
- Tcl_DecrRefCount(tclpath);
- /* FIXME: this is a private internal call */
- tclpath = TclGetLibraryPath();
- Tcl_IncrRefCount(tclpath);
-
- Tcl_ListObjLength(NULL, tclpath, pathcount);
- if (pathcount = 0) {
- bu_log(WARNING: tcl_library is unset (unexpected)\n);
- }
-}
-
-for (cnt=0; cnt pathcount; cnt++) {
- Tcl_ListObjIndex(NULL, tclpath, cnt, dir);
- Tcl_IncrRefCount(dir);
- if (dir) {
-#ifdef DEBUG
- bu_log(Using Tcl library at %s\n, Tcl_GetString(dir));
-#endif
- }
- Tcl_DecrRefCount(dir);
-}
-Tcl_DecrRefCount(tclpath);
-}
-
-
-/**
* Set up the Tcl auto_path for locating various necessary BRL-CAD
* scripting resources. Detect whether the current invocation is from
* an installed binary or not and append to the auto_path accordingly
@@ -424,14 +362,6 @@
if (!found_init_tcl) {
snprintf(buffer, MAX_BUF, %s%cinit.tcl, srcpath,
BU_DIR_SEPARATOR);
if (bu_file_exists(buffer)) {
- /* these doesn't seem to do what one might expect
-* here, but call it anyways.
-*/
- Tcl_Obj *newpath = Tcl_NewStringObj(srcpath, -1);
- Tcl_IncrRefCount(newpath);
- TclSetLibraryPath(newpath);
- Tcl_DecrRefCount(newpath);
-
/* this really sets it */
snprintf(buffer, MAX_BUF, set tcl_library {%s}, srcpath);
if (Tcl_Eval(interp, buffer)) {
Modified: brlcad/trunk/src/mged/setup.c
===
--- brlcad/trunk/src/mged/setup.c 2011-02-01 22:56:50 UTC (rev 42863)
+++ brlcad/trunk/src/mged/setup.c 2011-02-01 23:00:38 UTC (rev 42864)
@@ -503,11 +503,6 @@
}
[brlcad-commits] SF.net SVN: brlcad:[42865] brlcad/branches/cmake/src
Revision: 42865
http://brlcad.svn.sourceforge.net/brlcad/?rev=42865view=rev
Author: starseeker
Date: 2011-02-01 23:02:04 + (Tue, 01 Feb 2011)
Log Message:
---
remove tclcad_tcl_library in CMake branch too
Modified Paths:
--
brlcad/branches/cmake/src/bwish/main.c
brlcad/branches/cmake/src/gtools/g_diff.c
brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c
brlcad/branches/cmake/src/mged/setup.c
Modified: brlcad/branches/cmake/src/bwish/main.c
===
--- brlcad/branches/cmake/src/bwish/main.c 2011-02-01 23:00:38 UTC (rev
42864)
+++ brlcad/branches/cmake/src/bwish/main.c 2011-02-01 23:02:04 UTC (rev
42865)
@@ -99,11 +99,6 @@
}
init_tcl=0;
- /* warn if tcl_library isn't set by now */
- if (try_auto_path) {
- tclcad_tcl_library(interp);
- }
-
#ifdef BWISH
/* Initialize Tk */
Tcl_ResetResult(interp);
Modified: brlcad/branches/cmake/src/gtools/g_diff.c
===
--- brlcad/branches/cmake/src/gtools/g_diff.c 2011-02-01 23:00:38 UTC (rev
42864)
+++ brlcad/branches/cmake/src/gtools/g_diff.c 2011-02-01 23:02:04 UTC (rev
42865)
@@ -950,7 +950,6 @@
Tcl_FindExecutable(argv[0]);
interp = Tcl_CreateInterp();
tclcad_auto_path(interp);
-tclcad_tcl_library(interp);
if (Tcl_Init(interp) == TCL_ERROR) {
bu_log(Tcl_Init failure:\n%s\n, Tcl_GetStringResult(interp));
Modified: brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c
===
--- brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c2011-02-01
23:00:38 UTC (rev 42864)
+++ brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c2011-02-01
23:02:04 UTC (rev 42865)
@@ -94,69 +94,7 @@
return NULL;
}
-
/**
- * debug printing routine for printing out the tcl_library value(s)
- */
-void
-tclcad_tcl_library(Tcl_Interp *interp)
-{
-int cnt = 0;
-int pathcount = 0;
-Tcl_Obj *dir = NULL;
-Tcl_Obj *tclpath = NULL;
-char buffer[MAX_BUF] = {0};
-
-/* FIXME: this is a private internal call */
-tclpath = TclGetLibraryPath();
-if (!tclpath) {
- bu_log(WARNING: Unable to get the library path\n);
- return;
-}
-
-Tcl_IncrRefCount(tclpath);
-Tcl_ListObjLength(NULL, tclpath, pathcount);
-if (pathcount 1) {
- bu_log(WARNING: tcl_library is set to multiple paths?\n);
-} else if (pathcount = 0) {
- if (interp) {
- const char *setting;
- snprintf(buffer, MAX_BUF, set tcl_library);
- Tcl_Eval(interp, buffer);
- setting = Tcl_GetStringResult(interp);
- if (setting (strlen(setting) 0)) {
- Tcl_Obj *tcllib = Tcl_NewStringObj(setting, -1);
- Tcl_Obj *listtl = Tcl_NewListObj(1, tcllib);
- TclSetLibraryPath(listtl);
- }
- }
-
- Tcl_DecrRefCount(tclpath);
- /* FIXME: this is a private internal call */
- tclpath = TclGetLibraryPath();
- Tcl_IncrRefCount(tclpath);
-
- Tcl_ListObjLength(NULL, tclpath, pathcount);
- if (pathcount = 0) {
- bu_log(WARNING: tcl_library is unset (unexpected)\n);
- }
-}
-
-for (cnt=0; cnt pathcount; cnt++) {
- Tcl_ListObjIndex(NULL, tclpath, cnt, dir);
- Tcl_IncrRefCount(dir);
- if (dir) {
-#ifdef DEBUG
- bu_log(Using Tcl library at %s\n, Tcl_GetString(dir));
-#endif
- }
- Tcl_DecrRefCount(dir);
-}
-Tcl_DecrRefCount(tclpath);
-}
-
-
-/**
* Set up the Tcl auto_path for locating various necessary BRL-CAD
* scripting resources. Detect whether the current invocation is from
* an installed binary or not and append to the auto_path accordingly
@@ -424,14 +362,6 @@
if (!found_init_tcl) {
snprintf(buffer, MAX_BUF, %s%cinit.tcl, srcpath,
BU_DIR_SEPARATOR);
if (bu_file_exists(buffer)) {
- /* these doesn't seem to do what one might expect
-* here, but call it anyways.
-*/
- Tcl_Obj *newpath = Tcl_NewStringObj(srcpath, -1);
- Tcl_IncrRefCount(newpath);
- TclSetLibraryPath(newpath);
- Tcl_DecrRefCount(newpath);
-
/* this really sets it */
snprintf(buffer, MAX_BUF, set tcl_library {%s}, srcpath);
if (Tcl_Eval(interp, buffer)) {
Modified: brlcad/branches/cmake/src/mged/setup.c
===
--- brlcad/branches/cmake/src/mged/setup.c 2011-02-01 23:00:38 UTC (rev
42864)
+++ brlcad/branches/cmake/src/mged/setup.c 2011-02-01 23:02:04 UTC (rev
42865)
@@ -503,11 +503,6 @@
}
init_tcl = 0;
- /* warn if tcl_library isn't set by now */
- if (try_auto_path) {
-
[brlcad-commits] SF.net SVN: brlcad:[42866] brlcad/trunk/src/tclscripts/archer/Archer.tcl
Revision: 42866
http://brlcad.svn.sourceforge.net/brlcad/?rev=42866view=rev
Author: bob1961
Date: 2011-02-01 23:10:46 + (Tue, 01 Feb 2011)
Log Message:
---
Updated Archer::constructor to properly set the view of the command window
(i.e. how much command window to display verses geometry window etc.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-01 23:02:04 UTC
(rev 42865)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-02-01 23:10:46 UTC
(rev 42866)
@@ -520,7 +520,17 @@
set mVPaneToggle5 $mVPaneFraction5
readPreferences
+ set save_hpanefraction1 $mHPaneFraction1
+ set save_hpanefraction2 $mHPaneFraction2
buildCommandViewNew 1
+
+ if {!$mSeparateCommandWindow} {
+ set mHPaneFraction1 $save_hpanefraction1
+ set mHPaneFraction2 $save_hpanefraction2
+ $itk_component(hpane) fraction $mHPaneFraction1 $mHPaneFraction2
+ }
+
+
set mDelayCommandViewBuild 0
pack $itk_component(advancedTabs) -fill both -expand yes
::update
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42867] brlcad/branches/cmake/CMakeLists.txt
Revision: 42867
http://brlcad.svn.sourceforge.net/brlcad/?rev=42867view=rev
Author: starseeker
Date: 2011-02-01 23:25:45 + (Tue, 01 Feb 2011)
Log Message:
---
no reason to use cmake_noprod.cmake - just call it noprod so it's more like a
make target
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-02-01 23:10:46 UTC (rev
42866)
+++ brlcad/branches/cmake/CMakeLists.txt2011-02-01 23:25:45 UTC (rev
42867)
@@ -139,10 +139,10 @@
# hence the use of properties to allow access to directory-specific
# and global information scopes.
-# The BRL-CAD build generates cmake_noprod.cmake files that can be
+# The BRL-CAD build generates noprod files that can be
# manually run to simulate the workings of make noprod in that directory:
#
-# cmake -P ./cmake_noprod.cmake
+# cmake -P ./noprod
#
# This will remove just the final output files from all exec and
# library targets in that directory. It is not practical to have
@@ -221,7 +221,7 @@
ENDIF(EXISTS \${file})
ENDFOREACH(file \${CMAKE_TARGET_FILE_LIST})
)
- FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${name}/cmake_noprod.cmake
${noprod_file})
+ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${name}/noprod ${noprod_file})
ENDIF(target_list)
get_property(target_list DIRECTORY PROPERTY DIR_TARGET_LIST)
get_property(child_list DIRECTORY ${name} PROPERTY DIR_TARGET_LIST)
@@ -262,7 +262,7 @@
ENDIF(EXISTS \${file})
ENDFOREACH(file \${CMAKE_TARGET_FILE_LIST})
)
- FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake_noprod.cmake ${noprod_file})
+ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noprod ${noprod_file})
ENDIF(target_list)
endfunction(add_subdirectory)
@@ -1400,8 +1400,8 @@
ENDIF(EXISTS \${file})
ENDFOREACH(file \${CMAKE_TARGET_FILE_LIST})
)
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake_noprod.cmake ${noprod_file})
-ADD_CUSTOM_TARGET(noprod ${CMAKE_COMMAND} -P
${CMAKE_BINARY_DIR}/cmake_noprod.cmake)
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noprod ${noprod_file})
+ADD_CUSTOM_TARGET(noprod ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/noprod)
# Generate the include/conf files
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42868] brlcad/branches/cmake/src
Revision: 42868
http://brlcad.svn.sourceforge.net/brlcad/?rev=42868view=rev
Author: starseeker
Date: 2011-02-01 23:44:58 + (Tue, 01 Feb 2011)
Log Message:
---
Don't enable Tk even with ENABLE_ALL if we aren't supposed to build it
Modified Paths:
--
brlcad/branches/cmake/src/bwish/CMakeLists.txt
brlcad/branches/cmake/src/other/CMakeLists.txt
Modified: brlcad/branches/cmake/src/bwish/CMakeLists.txt
===
--- brlcad/branches/cmake/src/bwish/CMakeLists.txt 2011-02-01 23:25:45 UTC
(rev 42867)
+++ brlcad/branches/cmake/src/bwish/CMakeLists.txt 2011-02-01 23:44:58 UTC
(rev 42868)
@@ -26,6 +26,6 @@
ADD_DEPENDENCIES(btclsh itcl)
ENDIF(ITCL_LIBRARY MATCHES ^itcl$)
-IF(ITK_LIBRARY MATCHES ^itk$)
+IF(ITK_LIBRARY MATCHES ^itk$ AND BRLCAD-ENABLE_TK)
ADD_DEPENDENCIES(bwish itcl itk)
-ENDIF(ITK_LIBRARY MATCHES ^itk$)
+ENDIF(ITK_LIBRARY MATCHES ^itk$ AND BRLCAD-ENABLE_TK)
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2011-02-01 23:25:45 UTC
(rev 42867)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2011-02-01 23:44:58 UTC
(rev 42868)
@@ -116,10 +116,6 @@
OPTION(BRLCAD_BUILD_LOCAL_TK Build the local versions of Tcl/Tk OFF)
SET(BRLCAD_BUILD_LOCAL_TK OFF CACHE BOOL local tk build FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_TCL AND TCL_REQUIRE_TK)
-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 BOOL local tk build FORCE)
-ENDIF(BRLCAD-ENABLE_ALL_LOCAL_LIBS)
MARK_AS_ADVANCED(BRLCAD_BUILD_LOCAL_TK)
IF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
ADD_SUBDIRECTORY(tcl)
@@ -161,7 +157,7 @@
FILE(APPEND ${CONFIG_H_FILE} #define TCL_SYSTEM_INITTCL_PATH
\${tcl_inittcl}\\n)
ENDIF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
-IF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
+IF(BRLCAD_BUILD_LOCAL_TK)
ADD_SUBDIRECTORY(tk)
# Set the variables ourselves since FindTCL.cmake doesn't know about our
build
SET(TCL_TK_LIBRARY tk CACHE STRING TCL_TK_LIBRARY FORCE)
@@ -191,9 +187,9 @@
ENDIF(WIN32)
FILE(APPEND ${CONFIG_H_FILE} #define HAVE_TK_H 1\n)
ADD_DEPENDENCIES(tk tcl)
-ELSE(BRLCAD_BUILD_LOCAL_TK OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
+ELSE(BRLCAD_BUILD_LOCAL_TK)
BRLCAD_INCLUDE_FILE(tk.h HAVE_TK_H)
-ENDIF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
+ENDIF(BRLCAD_BUILD_LOCAL_TK)
MARK_AS_ADVANCED(TK_INCLUDE_PATH)
MARK_AS_ADVANCED(TK_LIBRARY)
MARK_AS_ADVANCED(TK_STUB_LIBRARY)
@@ -241,6 +237,17 @@
SET(BRLCAD_BUILD_LOCAL_TKPNG ON CACHE BOOL Build the local
TKPNG package FORCE)
OPTION(BRLCAD_BUILD_LOCAL_TKTABLE Build the local TKTABLE
package ON)
SET(BRLCAD_BUILD_LOCAL_TKTABLE ON CACHE BOOL Build the local
TKTABLE package FORCE)
+ ELSE(BRLCAD_BUILD_LOCAL_TK)
+ OPTION(BRLCAD_BUILD_LOCAL_ITK Build the local ITK package OFF)
+ SET(BRLCAD_BUILD_LOCAL_ITK OFF CACHE BOOL Build the local ITK
package FORCE)
+ OPTION(BRLCAD_BUILD_LOCAL_IWIDGETS Build the local IWIDGETS
package OFF)
+ SET(BRLCAD_BUILD_LOCAL_IWIDGETS OFF CACHE BOOL Build the local
IWIDGETS package FORCE)
+ OPTION(BRLCAD_BUILD_LOCAL_TKHTML Build the local TKHTML
package OFF)
+ SET(BRLCAD_BUILD_LOCAL_TKHTML OFF CACHE BOOL Build the local
TKHTML package FORCE)
+ OPTION(BRLCAD_BUILD_LOCAL_TKPNG Build the local TKPNG package
OFF)
+ SET(BRLCAD_BUILD_LOCAL_TKPNG OFF CACHE BOOL Build the local
TKPNG package FORCE)
+ OPTION(BRLCAD_BUILD_LOCAL_TKTABLE Build the local TKTABLE
package OFF)
+ SET(BRLCAD_BUILD_LOCAL_TKTABLE OFF CACHE BOOL Build the local
TKTABLE package FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_TK)
ENDIF(NOT BRLCAD_BUILD_LOCAL_TCL)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42869] brlcad/branches/cmake/TODO.cmake
Revision: 42869 http://brlcad.svn.sourceforge.net/brlcad/?rev=42869view=rev Author: starseeker Date: 2011-02-02 00:31:27 + (Wed, 02 Feb 2011) Log Message: --- Add a few more TODO items for CMake Modified Paths: -- brlcad/branches/cmake/TODO.cmake Modified: brlcad/branches/cmake/TODO.cmake === --- brlcad/branches/cmake/TODO.cmake2011-02-01 23:44:58 UTC (rev 42868) +++ brlcad/branches/cmake/TODO.cmake2011-02-02 00:31:27 UTC (rev 42869) @@ -11,6 +11,15 @@ 18. 64 bit Windows build - will need a few flags, at least in tcl/tk +19. See if you can auto-generate documentation for configure options by pulling +doc properties from options not marked as advanced and generating a formatted +text file + +20. Update README, INSTALL, doc/*, etc. + +21. Test combinations of options, look more closely at what benchmark and rtserver only +intend to accomplish. + Done (to first order, all this needs testing) 1. Detect OpenGL properly on Apple - choose X11 vs Aqua, and get the ogl code working This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42870] brlcad/trunk/src/mged/mged.c
Revision: 42870
http://brlcad.svn.sourceforge.net/brlcad/?rev=42870view=rev
Author: starseeker
Date: 2011-02-02 00:34:56 + (Wed, 02 Feb 2011)
Log Message:
---
dbip_filename - dbi_filename
Modified Paths:
--
brlcad/trunk/src/mged/mged.c
Modified: brlcad/trunk/src/mged/mged.c
===
--- brlcad/trunk/src/mged/mged.c2011-02-02 00:31:27 UTC (rev 42869)
+++ brlcad/trunk/src/mged/mged.c2011-02-02 00:34:56 UTC (rev 42870)
@@ -2783,7 +2783,7 @@
if (dbip-dbi_version 0) {
bu_log(Database [%s] was already (perhaps automatically)
flipped, -f is redundant.\n, dbip-dbi_filename);
} else {
- bu_log(Treating [%s] as a binary-incompatible v4 geometry
database.\n, dbip-dbip_filename);
+ bu_log(Treating [%s] as a binary-incompatible v4 geometry
database.\n, dbip-dbi_filename);
/* flip the version number to indicate a flipped database. */
dbip-dbi_version *= -1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42871] brlcad/trunk/src/libbu/brlcad_path.c
Revision: 42871
http://brlcad.svn.sourceforge.net/brlcad/?rev=42871view=rev
Author: starseeker
Date: 2011-02-02 01:22:25 + (Wed, 02 Feb 2011)
Log Message:
---
Dur. BRLCAD_DATA is supposed to be a full path, but I had a relative path in
the CMake logic... hilarity ensued. Put it back the way it should be and make
CMake do it right.
Modified Paths:
--
brlcad/trunk/src/libbu/brlcad_path.c
Modified: brlcad/trunk/src/libbu/brlcad_path.c
===
--- brlcad/trunk/src/libbu/brlcad_path.c2011-02-02 00:34:56 UTC (rev
42870)
+++ brlcad/trunk/src/libbu/brlcad_path.c2011-02-02 01:22:25 UTC (rev
42871)
@@ -567,21 +567,6 @@
lhs = _brlcad_data();
snprintf(where, MAX_WHERE_SIZE, \tBRLCAD_DATA compile-time path [%s]\n,
lhs);
if (_bu_find_path(result, lhs, rhs, searched, where)) {
-const char *ipwd = _bu_ipwd();
- char full_path[MAXPATHLEN] = {0};
- snprintf(full_path, MAXPATHLEN, %s%c%s, ipwd, BU_DIR_SEPARATOR,
result);
-#ifdef HAVE_REALPATH
- if (realpath(full_path, result) == NULL) {
- perror(realpath);
- bu_strlcpy(result, full_path, (size_t)MAXPATHLEN);
- }
-#else
-# ifdef HAVE_GETFULLPATHNAME
- GetFullPathName(full_path, MAXPATHLEN, result, NULL);
-# else
- snprintf(result, MAXPATHLEN, %s, full_path);
-# endif
-#endif
if (UNLIKELY(bu_debug BU_DEBUG_PATHS)) {
bu_log(Found: BRLCAD_DATA compile-time path [%s]\n, result);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42872] brlcad/trunk/configure.ac
Revision: 42872 http://brlcad.svn.sourceforge.net/brlcad/?rev=42872view=rev Author: starseeker Date: 2011-02-02 01:29:44 + (Wed, 02 Feb 2011) Log Message: --- Add note that BRLCAD_DATA must be a full path Modified Paths: -- brlcad/trunk/configure.ac Modified: brlcad/trunk/configure.ac === --- brlcad/trunk/configure.ac 2011-02-02 01:22:25 UTC (rev 42871) +++ brlcad/trunk/configure.ac 2011-02-02 01:29:44 UTC (rev 42872) @@ -199,6 +199,8 @@ # set up the BRLCAD_DATA install directory, sets bc_data_dir # e.g. /usr/local/share/brlcad/7.4.0 +# Note that BRLCAD_DATA is expected to be a full path - relative +# paths will not work BC_BRLCAD_DATA # if this is not a checkout, disable dependency tracking for a faster @@ -4274,6 +4276,7 @@ doc/html/ReleaseNotes/Rel6.0/Makefile doc/html/manuals/Anim_Tutorial/Makefile doc/html/manuals/Makefile + doc/html/manuals/archer/Makefile doc/html/manuals/cadwidgets/Makefile doc/html/manuals/libbu/Makefile doc/html/manuals/libdm/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42873] brlcad/branches/cmake
Revision: 42873
http://brlcad.svn.sourceforge.net/brlcad/?rev=42873view=rev
Author: starseeker
Date: 2011-02-02 01:39:28 + (Wed, 02 Feb 2011)
Log Message:
---
Do BRLCAD_DATA the right way in CMake.
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/configure.ac
brlcad/branches/cmake/src/libbu/brlcad_path.c
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-02-02 01:29:44 UTC (rev
42872)
+++ brlcad/branches/cmake/CMakeLists.txt2011-02-02 01:39:28 UTC (rev
42873)
@@ -505,7 +505,7 @@
FILE(APPEND ${CONFIG_H_FILE} #define PACKAGE_NAME \BRL-CAD\\n)
FILE(APPEND ${CONFIG_H_FILE} #define PACKAGE_STRING \BRL-CAD
${BRLCAD_VERSION}\\n)
FILE(APPEND ${CONFIG_H_FILE} #define PACKAGE_TARNAME \brlcad\\n)
-FILE(APPEND ${CONFIG_H_FILE} #define BRLCAD_DATA
\${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}\\n)
+FILE(APPEND ${CONFIG_H_FILE} #define BRLCAD_DATA
\${CMAKE_INSTALL_PREFIX}/${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}\\n)
FILE(APPEND ${CONFIG_H_FILE} #define BRLCAD_ROOT
\${CMAKE_INSTALL_PREFIX}\\n)
FILE(APPEND ${CONFIG_H_FILE} #define PACKAGE_VERSION \${BRLCAD_VERSION}\\n)
FILE(APPEND ${CONFIG_H_FILE} #define VERSION \${BRLCAD_VERSION}\\n)
Modified: brlcad/branches/cmake/configure.ac
===
--- brlcad/branches/cmake/configure.ac 2011-02-02 01:29:44 UTC (rev 42872)
+++ brlcad/branches/cmake/configure.ac 2011-02-02 01:39:28 UTC (rev 42873)
@@ -199,6 +199,8 @@
# set up the BRLCAD_DATA install directory, sets bc_data_dir
# e.g. /usr/local/share/brlcad/7.4.0
+# Note that BRLCAD_DATA is expected to be a full path - relative
+# paths will not work
BC_BRLCAD_DATA
# if this is not a checkout, disable dependency tracking for a faster
Modified: brlcad/branches/cmake/src/libbu/brlcad_path.c
===
--- brlcad/branches/cmake/src/libbu/brlcad_path.c 2011-02-02 01:29:44 UTC
(rev 42872)
+++ brlcad/branches/cmake/src/libbu/brlcad_path.c 2011-02-02 01:39:28 UTC
(rev 42873)
@@ -567,21 +567,6 @@
lhs = _brlcad_data();
snprintf(where, MAX_WHERE_SIZE, \tBRLCAD_DATA compile-time path [%s]\n,
lhs);
if (_bu_find_path(result, lhs, rhs, searched, where)) {
-const char *ipwd = _bu_ipwd();
- char full_path[MAXPATHLEN] = {0};
- snprintf(full_path, MAXPATHLEN, %s%c%s, ipwd, BU_DIR_SEPARATOR,
result);
-#ifdef HAVE_REALPATH
- if (realpath(full_path, result) == NULL) {
- perror(realpath);
- bu_strlcpy(result, full_path, (size_t)MAXPATHLEN);
- }
-#else
-# ifdef HAVE_GETFULLPATHNAME
- GetFullPathName(full_path, MAXPATHLEN, result, NULL);
-# else
- snprintf(result, MAXPATHLEN, %s, full_path);
-# endif
-#endif
if (UNLIKELY(bu_debug BU_DEBUG_PATHS)) {
bu_log(Found: BRLCAD_DATA compile-time path [%s]\n, result);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42874] brlcad/trunk
Revision: 42874
http://brlcad.svn.sourceforge.net/brlcad/?rev=42874view=rev
Author: starseeker
Date: 2011-02-02 01:49:38 + (Wed, 02 Feb 2011)
Log Message:
---
Apply 42757 to trunk - without this, getting failures on gentoo with warnings
enabled.
Modified Paths:
--
brlcad/trunk/include/vector_fpu.h
brlcad/trunk/src/librt/opennurbs_ext.cpp
brlcad/trunk/src/other/openNURBS/opennurbs_base64.cpp
brlcad/trunk/src/other/openNURBS/opennurbs_base64.h
brlcad/trunk/src/other/openNURBS/opennurbs_light.cpp
brlcad/trunk/src/other/openNURBS/opennurbs_light.h
brlcad/trunk/src/other/tnt/tnt_vector.h
Modified: brlcad/trunk/include/vector_fpu.h
===
--- brlcad/trunk/include/vector_fpu.h 2011-02-02 01:39:28 UTC (rev 42873)
+++ brlcad/trunk/include/vector_fpu.h 2011-02-02 01:49:38 UTC (rev 42874)
@@ -44,7 +44,7 @@
}
templateint LEN
-inline dvecLEN::dvec(const double* vals, bool aligned)
+inline dvecLEN::dvec(const double* vals, bool UNUSED(aligned))
{
for (int i = 0; i LEN; i++)
data.v[i] = vals[i];
@@ -218,8 +218,8 @@
_init(0, 0);
}
-vec2d(double x, double y) {
- _init(x, y);
+vec2d(double xin, double yin) {
+ _init(xin, yin);
}
vec2d(const vec2d proto) {
@@ -265,11 +265,11 @@
double* v;
double m[4];
-void _init(double x, double y) {
+void _init(double xin, double yin) {
// align to 16-byte boundary
v = (double*)uintptr_t)m) + 0x10L) ~0xFL);
- v[0] = x;
- v[1] = y;
+ v[0] = xin;
+ v[1] = yin;
}
};
Modified: brlcad/trunk/src/librt/opennurbs_ext.cpp
===
--- brlcad/trunk/src/librt/opennurbs_ext.cpp2011-02-02 01:39:28 UTC (rev
42873)
+++ brlcad/trunk/src/librt/opennurbs_ext.cpp2011-02-02 01:49:38 UTC (rev
42874)
@@ -458,7 +458,7 @@
CurveTree::curveBBox(const ON_Curve* curve, int adj_face_index, ON_Interval
t, bool isLeaf, bool innerTrim, const ON_BoundingBox bb)
{
BRNode* node;
-fastf_t vdot = 1.0;
+int vdot = 1;
if (isLeaf) {
TRACE(creating leaf: u( u.Min() , u.Max() ) v(
v.Min() , v.Max() ));
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_base64.cpp
===
--- brlcad/trunk/src/other/openNURBS/opennurbs_base64.cpp 2011-02-02
01:39:28 UTC (rev 42873)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_base64.cpp 2011-02-02
01:49:38 UTC (rev 42874)
@@ -78,7 +78,7 @@
m_status = 1;
}
-const bool ON_DecodeBase64::Error() const
+bool ON_DecodeBase64::Error() const
{
return (1 == m_status);
}
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_base64.h
===
--- brlcad/trunk/src/other/openNURBS/opennurbs_base64.h 2011-02-02 01:39:28 UTC
(rev 42873)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_base64.h 2011-02-02 01:49:38 UTC
(rev 42874)
@@ -127,7 +127,7 @@
// Returns true if an error occured during decoding because
// invalid input was passed to Decode().
- const bool Error() const;
+ bool Error() const;
private:
int m_status; // 1: error - decoding stopped
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_light.cpp
===
--- brlcad/trunk/src/other/openNURBS/opennurbs_light.cpp2011-02-02
01:39:28 UTC (rev 42873)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_light.cpp2011-02-02
01:49:38 UTC (rev 42874)
@@ -366,7 +366,7 @@
return m_style;
}
-const ON_BOOL32 ON_Light::IsPointLight() const
+ON_BOOL32 ON_Light::IsPointLight() const
{
ON_BOOL32 rc;
switch(m_style)
@@ -383,7 +383,7 @@
return rc;
}
-const ON_BOOL32 ON_Light::IsDirectionalLight() const
+ON_BOOL32 ON_Light::IsDirectionalLight() const
{
ON_BOOL32 rc;
switch(m_style)
@@ -400,7 +400,7 @@
return rc;
}
-const ON_BOOL32 ON_Light::IsSpotLight() const
+ON_BOOL32 ON_Light::IsSpotLight() const
{
ON_BOOL32 rc;
switch(m_style)
@@ -417,7 +417,7 @@
return rc;
}
-const ON_BOOL32 ON_Light::IsLinearLight() const
+ON_BOOL32 ON_Light::IsLinearLight() const
{
ON_BOOL32 rc;
switch(m_style)
@@ -434,7 +434,7 @@
return rc;
}
-const ON_BOOL32 ON_Light::IsRectangularLight() const
+ON_BOOL32 ON_Light::IsRectangularLight() const
{
ON_BOOL32 rc;
switch(m_style)
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_light.h
===
--- brlcad/trunk/src/other/openNURBS/opennurbs_light.h 2011-02-02 01:39:28 UTC
(rev 42873)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_light.h 2011-02-02 01:49:38 UTC
(rev 42874)
@@ -112,11 +112,11 @@
void SetStyle(ON::light_style);
ON::light_style Style() const;
- const ON_BOOL32 IsPointLight() const;
[brlcad-commits] SF.net SVN: brlcad:[42875] brlcad/trunk/configure.ac
Revision: 42875 http://brlcad.svn.sourceforge.net/brlcad/?rev=42875view=rev Author: starseeker Date: 2011-02-02 01:55:29 + (Wed, 02 Feb 2011) Log Message: --- Whoops - manuals/archer is still gone Modified Paths: -- brlcad/trunk/configure.ac Modified: brlcad/trunk/configure.ac === --- brlcad/trunk/configure.ac 2011-02-02 01:49:38 UTC (rev 42874) +++ brlcad/trunk/configure.ac 2011-02-02 01:55:29 UTC (rev 42875) @@ -4276,7 +4276,6 @@ doc/html/ReleaseNotes/Rel6.0/Makefile doc/html/manuals/Anim_Tutorial/Makefile doc/html/manuals/Makefile - doc/html/manuals/archer/Makefile doc/html/manuals/cadwidgets/Makefile doc/html/manuals/libbu/Makefile doc/html/manuals/libdm/Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42876] brlcad/trunk/doc/docbook/Makefile.am
Revision: 42876 http://brlcad.svn.sourceforge.net/brlcad/?rev=42876view=rev Author: starseeker Date: 2011-02-02 02:12:00 + (Wed, 02 Feb 2011) Log Message: --- catalog.xml is no more Modified Paths: -- brlcad/trunk/doc/docbook/Makefile.am Modified: brlcad/trunk/doc/docbook/Makefile.am === --- brlcad/trunk/doc/docbook/Makefile.am2011-02-02 01:55:29 UTC (rev 42875) +++ brlcad/trunk/doc/docbook/Makefile.am2011-02-02 02:12:00 UTC (rev 42876) @@ -105,7 +105,6 @@ books/README \ books/en/Makefile.am \ books/en/tutorial_series_authors.xml \ - catalog.xml \ fop.xconf.in \ lessons/en/Makefile.am \ lessons/es/Makefile.am \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42877] brlcad/trunk/misc/Makefile.am
Revision: 42877 http://brlcad.svn.sourceforge.net/brlcad/?rev=42877view=rev Author: brlcad Date: 2011-02-02 03:32:03 + (Wed, 02 Feb 2011) Log Message: --- include debian/source/include-binaries in dist Modified Paths: -- brlcad/trunk/misc/Makefile.am Modified: brlcad/trunk/misc/Makefile.am === --- brlcad/trunk/misc/Makefile.am 2011-02-02 02:12:00 UTC (rev 42876) +++ brlcad/trunk/misc/Makefile.am 2011-02-02 03:32:03 UTC (rev 42877) @@ -57,6 +57,7 @@ debian/copyright \ debian/rules \ debian/source/format \ + debian/source/include-binaries \ doxygen_structure \ flawfinder \ libtool.m4 \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42878] brlcad/branches/cmake/src/other/togl/CMakeLists. txt
Revision: 42878
http://brlcad.svn.sourceforge.net/brlcad/?rev=42878view=rev
Author: starseeker
Date: 2011-02-02 03:39:28 + (Wed, 02 Feb 2011)
Log Message:
---
Stray character
Modified Paths:
--
brlcad/branches/cmake/src/other/togl/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/togl/CMakeLists.txt
===
--- brlcad/branches/cmake/src/other/togl/CMakeLists.txt 2011-02-02 03:32:03 UTC
(rev 42877)
+++ brlcad/branches/cmake/src/other/togl/CMakeLists.txt 2011-02-02 03:39:28 UTC
(rev 42878)
@@ -73,7 +73,7 @@
# Create the pkgIndex.tcl file.
GET_TARGET_PROPERTY(TOGL_LIBLOCATION togl LOCATION_${CMAKE_BUILD_TYPE})
GET_FILENAME_COMPONENT(TOGL_LIBNAME ${TOGL_LIBLOCATION} NAME)
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl package ifneeded
${TOGL_PKGNAME} ${TOGL_PKGVERSION} [list load [file join $dir .. .. ${LIB_DIR}
${TOGL_LIBNAME} }] togl])
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl package ifneeded
${TOGL_PKGNAME} ${TOGL_PKGVERSION} [list load [file join $dir .. .. ${LIB_DIR}
${TOGL_LIBNAME}] togl])
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
lib/${TOGL_PKGNAME}${TOGL_PKGVERSION})
FILE(WRITE
${CMAKE_BINARY_DIR}/lib/${TOGL_PKGNAME}${TOGL_PKGVERSION}/pkgIndex.tcl package
ifneeded ${TOGL_PKGNAME} ${TOGL_PKGVERSION} [list load [file join $dir
${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${TOGL_LIBNAME}] ${TOGL_PKGNAME}])
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42880] brlcad/branches/cmake/src/other/togl/demo/gears. tcl
Revision: 42880
http://brlcad.svn.sourceforge.net/brlcad/?rev=42880view=rev
Author: starseeker
Date: 2011-02-02 03:47:47 + (Wed, 02 Feb 2011)
Log Message:
---
Just package require Togl for the gears demo - don't need to manually load
anything if we're set up correctly.
Modified Paths:
--
brlcad/branches/cmake/src/other/togl/demo/gears.tcl
Modified: brlcad/branches/cmake/src/other/togl/demo/gears.tcl
===
--- brlcad/branches/cmake/src/other/togl/demo/gears.tcl 2011-02-02 03:39:30 UTC
(rev 42879)
+++ brlcad/branches/cmake/src/other/togl/demo/gears.tcl 2011-02-02 03:47:47 UTC
(rev 42880)
@@ -14,12 +14,10 @@
# Copyright (C) 1997 Philip Quaife
#
+package require Togl
+
package provide gears 1.0
-# add parent directory to path to find Togl's pkgIndex in current directory
-if { [file exists pkgIndex.tcl] } {
-set auto_path [linsert $auto_path 0 ..]
-}
# following load also loads Tk and Togl packages
load [file dirname [info script]]/gears[info sharedlibextension]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[42882] brlcad/branches/cmake/bench/CMakeLists.txt
Revision: 42882
http://brlcad.svn.sourceforge.net/brlcad/?rev=42882view=rev
Author: starseeker
Date: 2011-02-02 05:08:06 + (Wed, 02 Feb 2011)
Log Message:
---
benchmark needs pixcmp
Modified Paths:
--
brlcad/branches/cmake/bench/CMakeLists.txt
Modified: brlcad/branches/cmake/bench/CMakeLists.txt
===
--- brlcad/branches/cmake/bench/CMakeLists.txt 2011-02-02 03:53:03 UTC (rev
42881)
+++ brlcad/branches/cmake/bench/CMakeLists.txt 2011-02-02 05:08:06 UTC (rev
42882)
@@ -30,15 +30,13 @@
IF(SH_EXEC)
ADD_CUSTOM_TARGET(benchmark
${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark run
- DEPENDS rt
+ DEPENDS rt pixcmp
)
ADD_DEPENDENCIES(benchmark bldg391.g m35.g moss.g sphflake.g star.g
world.g)
ADD_CUSTOM_TARGET(benchmark-clean
${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark clean
- DEPENDS rt
)
ADD_CUSTOM_TARGET(benchmark-clobber
${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/benchmark clobber
- DEPENDS rt
)
ENDIF(SH_EXEC)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
