[Personalrobots-commit] SF.net SVN: personalrobots:[11954] pkg/trunk

[<rdi...@us...>]

Revision: 11954
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=11954&view=rev
Author:   rdiankov
Date:     2009-02-28 12:59:38 +0000 (Sat, 28 Feb 2009)

Log Message:
-----------
fixed bullet x86-64 compilation problem

Modified Paths:
--------------
    pkg/trunk/3rdparty/openrave/Makefile
    pkg/trunk/3rdparty/openrave/manifest.xml
    pkg/trunk/prcore/bullet/Makefile

Modified: pkg/trunk/3rdparty/openrave/Makefile
===================================================================
--- pkg/trunk/3rdparty/openrave/Makefile	2009-02-28 10:24:44 UTC (rev 11953)
+++ pkg/trunk/3rdparty/openrave/Makefile	2009-02-28 12:59:38 UTC (rev 11954)
@@ -9,13 +9,11 @@
 
 .PHONY: openrave
 
-#export CPATH="$(shell rospack find bullet)/include:$(CPATH)"
-#export LD_LIBRARY_PATH=$(shell rospack find bullet)/lib:$(LD_LIBRARY_PATH) && 
 BOOST_INCLUDE_DIRS=$(shell rosboost-cfg --include_dirs)
 BOOST_LIBRARY_DIRS=$(shell rosboost-cfg --lib_dirs)
 
 installed: $(SVN_DIR) patched
-	cd $(SVN_DIR) && export PATH="$(shell rospack find soqt)/bin:$(shell rospack find opende)/opende/bin:$(PATH)" && mkdir -p build && cd build && BOOST_INCLUDEDIR=$(BOOST_INCLUDE_DIRS) BOOST_LIBRARYDIR=$(BOOST_LIBRARY_DIRS) cmake -DCMAKE_INSTALL_PREFIX=$(PWD) -DCMAKE_BUILD_TYPE=Release -DBoost_INCLUDE_DIR=$(BOOST_INCLUDE_DIRS) -DBoost_LIBRARY_DIR=$(BOOST_LIBRARY_DIRS) .. && export PARALLEL_JOBS=ROS_PARALLEL_JOBS && make $(ROS_PARALLEL_JOBS) install
+	cd $(SVN_DIR) && export PATH="$(shell rospack find soqt)/bin:$(shell rospack find opende)/opende/bin:$(PATH)" && mkdir -p build && cd build && export CPATH="$(shell rospack find bullet)/include:$(CPATH)" && export LD_LIBRARY_PATH=$(shell rospack find bullet)/lib:$(LD_LIBRARY_PATH) && BOOST_INCLUDEDIR=$(BOOST_INCLUDE_DIRS) BOOST_LIBRARYDIR=$(BOOST_LIBRARY_DIRS) cmake -DCMAKE_INSTALL_PREFIX=$(PWD) -DCMAKE_BUILD_TYPE=Release -DBoost_INCLUDE_DIR=$(BOOST_INCLUDE_DIRS) -DBoost_LIBRARY_DIR=$(BOOST_LIBRARY_DIRS) .. && export PARALLEL_JOBS=ROS_PARALLEL_JOBS && make $(ROS_PARALLEL_JOBS) install
 	touch installed
 
 clean:

Modified: pkg/trunk/3rdparty/openrave/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/openrave/manifest.xml	2009-02-28 10:24:44 UTC (rev 11953)
+++ pkg/trunk/3rdparty/openrave/manifest.xml	2009-02-28 12:59:38 UTC (rev 11954)
@@ -11,7 +11,7 @@
     <cpp lflags="-Wl,-rpath,${prefix}/lib `${prefix}/bin/openrave-config --libs`" cflags="`${prefix}/bin/openrave-config --cflags`"/>
   </export>
   <depend package="soqt"/>
-<!--   <depend package="bullet"/> -->
+  <depend package="bullet"/>
   <depend package="opende"/>
   <depend package="std_msgs"/>
 <!--   <depend package="laser_scan"/> -->

Modified: pkg/trunk/prcore/bullet/Makefile
===================================================================
--- pkg/trunk/prcore/bullet/Makefile	2009-02-28 10:24:44 UTC (rev 11953)
+++ pkg/trunk/prcore/bullet/Makefile	2009-02-28 12:59:38 UTC (rev 11954)
@@ -31,7 +31,7 @@
 		  BulletSoftBody 
 
 installed: $(SVN_DIR) patched
-	cd $(SVN_DIR) && cmake -DCMAKE_INSTALL_PREFIX=$(PWD) .
+	cd $(SVN_DIR) && cmake -DCMAKE_INSTALL_PREFIX=$(PWD) -DCMAKE_CXX_FLAGS=-fPIC .
 	# Bullet appears not be parallel-make safe
 	#cd $(SVN_DIR) && make $(PARALLEL_JOBS) 
 	cd $(SVN_DIR) && make $(BULLET_TARGETS)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.