Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[10133] pkg/trunk
|
From: <jfa...@us...> - 2009-01-24 06:07:14
|
Revision: 10133
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=10133&view=rev
Author: jfaustwg
Date: 2009-01-24 06:07:08 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
Updated for removal of boost and log4cxx as 3rdparty packages
Modified Paths:
--------------
pkg/trunk/3rdparty/bfl/Makefile
pkg/trunk/3rdparty/bfl/manifest.xml
pkg/trunk/3rdparty/gazebo/Makefile
pkg/trunk/3rdparty/gazebo/manifest.xml
pkg/trunk/3rdparty/ijg_libjpeg/CMakeLists.txt
pkg/trunk/3rdparty/ijg_libjpeg/manifest.xml
pkg/trunk/3rdparty/kdl/Makefile
pkg/trunk/3rdparty/kdl/manifest.xml
pkg/trunk/3rdparty/kni-3.9.2/lm_boost_cxxflags.patch
pkg/trunk/3rdparty/kni-3.9.2/manifest.xml
pkg/trunk/3rdparty/libsunflower/Makefile
pkg/trunk/3rdparty/nepumuk/Makefile
pkg/trunk/3rdparty/nepumuk/manifest.xml
pkg/trunk/3rdparty/ogre/Makefile
pkg/trunk/3rdparty/ogre/manifest.xml
pkg/trunk/3rdparty/openrave/Makefile
pkg/trunk/3rdparty/openrave/manifest.xml
pkg/trunk/calibration/kinematic_calibration/CMakeLists.txt
pkg/trunk/calibration/kinematic_calibration/manifest.xml
pkg/trunk/calibration/wheel_odometry_calibration/CMakeLists.txt
pkg/trunk/calibration/wheel_odometry_calibration/manifest.xml
pkg/trunk/controllers/pr2_mechanism_controllers/CMakeLists.txt
pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml
pkg/trunk/deprecated/cv_wrappers/CMakeLists.txt
pkg/trunk/deprecated/cv_wrappers/manifest.xml
pkg/trunk/deprecated/libTF/CMakeLists.txt
pkg/trunk/deprecated/libTF/manifest.xml
pkg/trunk/deprecated/misc_utils/CMakeLists.txt
pkg/trunk/deprecated/misc_utils/manifest.xml
pkg/trunk/deprecated/random_utils/CMakeLists.txt
pkg/trunk/deprecated/random_utils/manifest.xml
pkg/trunk/deprecated/resource_locator/CMakeLists.txt
pkg/trunk/deprecated/resource_locator/manifest.xml
pkg/trunk/deprecated/scan_utils/CMakeLists.txt
pkg/trunk/deprecated/scan_utils/manifest.xml
pkg/trunk/drivers/cam/axis_cam/CMakeLists.txt
pkg/trunk/drivers/cam/axis_cam/manifest.xml
pkg/trunk/drivers/laser/laser_scan_annotator/CMakeLists.txt
pkg/trunk/drivers/laser/laser_scan_annotator/manifest.xml
pkg/trunk/drivers/motor/ethercat_hardware/CMakeLists.txt
pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml
pkg/trunk/drivers/robot/ipdcmot/CMakeLists.txt
pkg/trunk/drivers/robot/ipdcmot/manifest.xml
pkg/trunk/drivers/robot/pr2/point_cloud_assembler/CMakeLists.txt
pkg/trunk/drivers/robot/pr2/point_cloud_assembler/manifest.xml
pkg/trunk/drivers/robot/pr2/pr2_power_board/manifest.xml
pkg/trunk/drivers/robot/pr2/pr2_power_board/src/power_node/CMakeLists.txt
pkg/trunk/drivers/robot/segway_apox/CMakeLists.txt
pkg/trunk/drivers/robot/segway_apox/manifest.xml
pkg/trunk/drivers/simulator/gazebo_plugin/CMakeLists.txt
pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml
pkg/trunk/estimation/robot_pose_ekf/CMakeLists.txt
pkg/trunk/estimation/robot_pose_ekf/manifest.xml
pkg/trunk/hardware_test/self_test/CMakeLists.txt
pkg/trunk/hardware_test/self_test/manifest.xml
pkg/trunk/highlevel/executive_trex/executive_trex_pr2/CMakeLists.txt
pkg/trunk/highlevel/executive_trex/executive_trex_pr2/manifest.xml
pkg/trunk/highlevel/highlevel_controllers/CMakeLists.txt
pkg/trunk/highlevel/highlevel_controllers/manifest.xml
pkg/trunk/mechanism/mechanism_control/CMakeLists.txt
pkg/trunk/mechanism/mechanism_control/manifest.xml
pkg/trunk/motion_planning/kinematic_planning/CMakeLists.txt
pkg/trunk/motion_planning/kinematic_planning/manifest.xml
pkg/trunk/nav/nav_view_sdl/CMakeLists.txt
pkg/trunk/nav/nav_view_sdl/manifest.xml
pkg/trunk/nav/trajectory_rollout/CMakeLists.txt
pkg/trunk/nav/trajectory_rollout/manifest.xml
pkg/trunk/nav/wavefront_player/CMakeLists.txt
pkg/trunk/nav/wavefront_player/manifest.xml
pkg/trunk/openrave_planning/openraveros/CMakeLists.txt
pkg/trunk/openrave_planning/openraveros/manifest.xml
pkg/trunk/openrave_planning/ormanipulation/manifest.xml
pkg/trunk/openrave_planning/orrosplanning/CMakeLists.txt
pkg/trunk/openrave_planning/orrosplanning/manifest.xml
pkg/trunk/prcore/tf/CMakeLists.txt
pkg/trunk/prcore/tf/manifest.xml
pkg/trunk/robot_descriptions/openrave_robot_description/CMakeLists.txt
pkg/trunk/robot_descriptions/openrave_robot_description/manifest.xml
pkg/trunk/simulators/rosstage/CMakeLists.txt
pkg/trunk/simulators/rosstage/manifest.xml
pkg/trunk/util/laser_scan/CMakeLists.txt
pkg/trunk/util/laser_scan/manifest.xml
pkg/trunk/util/message_sequencing/CMakeLists.txt
pkg/trunk/util/message_sequencing/manifest.xml
pkg/trunk/util/realtime_tools/CMakeLists.txt
pkg/trunk/util/realtime_tools/manifest.xml
pkg/trunk/util/robot_self_filter/CMakeLists.txt
pkg/trunk/util/robot_self_filter/manifest.xml
pkg/trunk/util/topic_synchronizer/manifest.xml
pkg/trunk/vision/calib_converter/CMakeLists.txt
pkg/trunk/vision/calib_converter/manifest.xml
pkg/trunk/vision/calonder_descriptor/CMakeLists.txt
pkg/trunk/vision/calonder_descriptor/manifest.xml
pkg/trunk/vision/checkerboard_detector/CMakeLists.txt
pkg/trunk/vision/checkerboard_detector/manifest.xml
pkg/trunk/vision/color_calib/CMakeLists.txt
pkg/trunk/vision/color_calib/manifest.xml
pkg/trunk/vision/outlet_detection/CMakeLists.txt
pkg/trunk/vision/outlet_detection/manifest.xml
pkg/trunk/vision/people/CMakeLists.txt
pkg/trunk/vision/people/manifest.xml
pkg/trunk/vision/place_recognition/CMakeLists.txt
pkg/trunk/vision/place_recognition/manifest.xml
pkg/trunk/vision/stereo_blob_tracker/CMakeLists.txt
pkg/trunk/vision/stereo_blob_tracker/manifest.xml
pkg/trunk/vision/visual_odometry/CMakeLists.txt
pkg/trunk/vision/visual_odometry/manifest.xml
pkg/trunk/visualization/cloud_viewer/CMakeLists.txt
pkg/trunk/visualization/cloud_viewer/manifest.xml
pkg/trunk/visualization/ogre_tools/CMakeLists.txt
pkg/trunk/visualization/ogre_tools/manifest.xml
pkg/trunk/visualization/ogre_visualizer/CMakeLists.txt
pkg/trunk/visualization/ogre_visualizer/manifest.xml
pkg/trunk/visualization/wx_camera_panel/CMakeLists.txt
pkg/trunk/visualization/wx_camera_panel/manifest.xml
pkg/trunk/world_models/costmap_2d/CMakeLists.txt
pkg/trunk/world_models/costmap_2d/manifest.xml
pkg/trunk/world_models/robot_models/collision_space/CMakeLists.txt
pkg/trunk/world_models/robot_models/collision_space/manifest.xml
pkg/trunk/world_models/topological_map/CMakeLists.txt
pkg/trunk/world_models/topological_map/manifest.xml
pkg/trunk/world_models/world_3d_map/CMakeLists.txt
pkg/trunk/world_models/world_3d_map/manifest.xml
Added Paths:
-----------
pkg/trunk/3rdparty/ogre/boost.patch
pkg/trunk/drivers/input/joy_annotator/joy_node.cpp
Property Changed:
----------------
pkg/trunk/
Property changes on: pkg/trunk
___________________________________________________________________
Modified: svk:merge
- 637b03a7-42c1-4bbd-8d43-e365e379942c:/rosTF_to_tf:9746
920d6130-5740-4ec1-bb1a-45963d5fd813:/frameidpr:7015
920d6130-5740-4ec1-bb1a-45963d5fd813:/users/josh-pr:11755
920d6130-5740-4ec1-bb1a-45963d5fd813:/wgpkgtrunk:5865
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/josh:9624
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/rosbus:261
+ 637b03a7-42c1-4bbd-8d43-e365e379942c:/rosTF_to_tf:9746
920d6130-5740-4ec1-bb1a-45963d5fd813:/frameidpr:7015
920d6130-5740-4ec1-bb1a-45963d5fd813:/users/josh-pr:11755
920d6130-5740-4ec1-bb1a-45963d5fd813:/wgpkgtrunk:5865
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/josh:10106
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/rosbus:261
Modified: pkg/trunk/3rdparty/bfl/Makefile
===================================================================
--- pkg/trunk/3rdparty/bfl/Makefile 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/bfl/Makefile 2009-01-24 06:07:08 UTC (rev 10133)
@@ -6,9 +6,9 @@
SVN_PATCH = mcpdf.patch warning.patch
INSTALL_DIR = bfl-boost
CMAKE = cmake
-BOOST_ROOT =$(shell rospack find boost)/boost
+BOOST_INCLUDE =$(shell rosboost-cfg --include_dirs)
CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(PWD)/$(INSTALL_DIR)/ \
- -DMATRIX_LIB=boost -DRNG_LIB=boost -DBOOST_FOUND=`rospack find boost`/boost/include/
+ -DMATRIX_LIB=boost -DRNG_LIB=boost -DBOOST_FOUND=$(BOOST_INCLUDE)
include $(shell rospack find mk)/svn_checkout.mk
Modified: pkg/trunk/3rdparty/bfl/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/bfl/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/bfl/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -17,7 +17,6 @@
<doxymaker external="http://orocos.org/bfl" />
</export>
-<depend package="boost" />
<sysdepend os="ubuntu" version="7.04-feisty" package="subversion"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="subversion"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libcppunit-dev"/>
Modified: pkg/trunk/3rdparty/gazebo/Makefile
===================================================================
--- pkg/trunk/3rdparty/gazebo/Makefile 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/gazebo/Makefile 2009-01-24 06:07:08 UTC (rev 10133)
@@ -19,19 +19,18 @@
ROOT = $(shell rospack find gazebo)/gazebo
TESTROOT = $(shell rospack find gazebo)/test-gazebo
-BOOST_ROOT = $(shell rospack find boost)/boost
+BOOST_CFLAGS = $(shell rosboost-cfg --cflags)
+BOOST_LFLAGS = $(shell rosboost-cfg --lflags signals,thread)
-CCFLAGS=-I${BOOST_ROOT}/include
-
build: SVN_UP_REVERT_PATCH gazebo
.PHONY: gazebo
gazebo: $(SVN_DIR)
if [ ! -d gazebo ]; then mkdir -p gazebo; mkdir -p gazebo/share; mkdir -p gazebo/share/gazebo; mkdir -p gazebo/share/gazebo/worlds; mkdir -p gazebo/share/gazebo/Media; fi
cd $(SVN_DIR) && PKG_CONFIG_PATH=${CV_PKG}:${ODE_PKG}:${FI_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} PATH=${ODE_PATH}:${PATH} \
- scons mode=optimized prefix=$(ROOT) boost_cflags='-I${BOOST_ROOT}/include' boost_lflags='-lboost_system-mt -lboost_graph -lboost_regex -lboost_signals -lboost_thread -L${BOOST_ROOT}/lib'
+ scons mode=optimized prefix=$(ROOT) boost_cflags="$(BOOST_CFLAGS)" boost_lflags="$(BOOST_LFLAGS)"
-cd $(SVN_DIR) && PKG_CONFIG_PATH=${CV_PKG}:${ODE_PKG}:${FI_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} PATH=${ODE_PATH}:${PATH} \
- scons mode=optimized prefix=$(ROOT) boost_cflags='-I${BOOST_ROOT}/include' boost_lflags='-lboost_system-mt -lboost_graph -lboost_regex -lboost_signals -lboost_thread -L${BOOST_ROOT}/lib' install
+ scons mode=optimized prefix=$(ROOT) boost_cflags="$(BOOST_CFLAGS)" boost_lflags="$(BOOST_LFLAGS)" install
touch gazebo
ROOT_ORIG = $(shell rospack find gazebo)/gazebo-original
Modified: pkg/trunk/3rdparty/gazebo/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/gazebo/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/gazebo/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -21,10 +21,6 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="libltdl3-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libfltk1.1"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libfltk1.1-dev"/>
- <!--sysdepend os="ubuntu" version="7.04-feisty" package="libboost-signals1.34.1"/>
- <sysdepend os="ubuntu" version="7.04-feisty" package="libboost-signals-dev"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="libboost-signals1.34.1"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="libboost-signals-dev"/-->
</package>
Modified: pkg/trunk/3rdparty/ijg_libjpeg/CMakeLists.txt
===================================================================
--- pkg/trunk/3rdparty/ijg_libjpeg/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/ijg_libjpeg/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -21,6 +21,9 @@
COMMAND sed -e '/HAVE_STDLIB_H/d' -e '/HAVE_STDDEF_H/d' <${PROJECT_SOURCE_DIR}/build/jpeg-6b/jconfig.h >${PROJECT_SOURCE_DIR}/include/ijg_libjpeg/jconfig.h
)
+rospack_add_boost_directories()
+
rospack_add_library(ros_jpeg_mutex src/ros_jpeg_mutex.cpp)
+rospack_link_boost(ros_jpeg_mutex thread)
add_file_dependencies(src/ros_jpeg_mutex.cpp ${PROJECT_SOURCE_DIR}/lib/libjpeg.a)
Modified: pkg/trunk/3rdparty/ijg_libjpeg/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/ijg_libjpeg/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/ijg_libjpeg/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -15,7 +15,6 @@
<license>BSD-style</license>
<review status="3rdparty" notes=""/>
<url>http://www.ijg.org</url>
-<depend package="boost"/>
<export>
<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -ljpeg -lros_jpeg_mutex"/>
<doxymaker external="http://www.ijg.org"/>
Modified: pkg/trunk/3rdparty/kdl/Makefile
===================================================================
--- pkg/trunk/3rdparty/kdl/Makefile 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/kdl/Makefile 2009-01-24 06:07:08 UTC (rev 10133)
@@ -2,12 +2,13 @@
SOURCE_DIR = kdl-willow
CMAKE = cmake
-BOOST_ROOT =$(shell rospack find boost)/boost
+BOOST_INCLUDE_DIR = $(shell rosboost-cfg --include_dirs)
+BOOST_LIBRARY_DIR = $(shell rosboost-cfg --library_dirs)
CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(PWD)/kdl/ \
-DPYTHON_BINDINGS=OFF \
-DKDL_PYTHON_INSTALL_PATH=$(PWD)/kdl/lib/ \
- -DBOOST_INCLUDEDIR:STRING=$(BOOST_ROOT)/include \
- -DBOOST_LIBRARYDIR:STRING=$(BOOST_ROOT)/lib
+ -DBOOST_INCLUDEDIR:STRING=$(BOOST_INCLUDE_DIR) \
+ -DBOOST_LIBRARYDIR:STRING=$(BOOST_LIBRARY_DIR)
installed: wiped
-mkdir -p $(SOURCE_DIR)/build
Modified: pkg/trunk/3rdparty/kdl/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/kdl/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/kdl/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -4,7 +4,6 @@
<author>Advait Jain, Sachin Chitta</author>
<license>BSD</license>
<review status="3rdparty" notes=""/>
-<depend package="boost" />
<url>http://pr.willowgarage.net</url>
<export>
<cpp cflags="-I${prefix}/kdl/include" lflags="-Wl,-rpath,${prefix}/kdl/lib -L${prefix}/kdl/lib -lorocos-kdl"/>
Modified: pkg/trunk/3rdparty/kni-3.9.2/lm_boost_cxxflags.patch
===================================================================
--- pkg/trunk/3rdparty/kni-3.9.2/lm_boost_cxxflags.patch 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/kni-3.9.2/lm_boost_cxxflags.patch 2009-01-24 06:07:08 UTC (rev 10133)
@@ -5,7 +5,7 @@
CXX = g++
-CXXFLAGS += -fPIC -g -O2 -Wall
-+CXXFLAGS += -fPIC -g -O2 -Wall `rospack export/cpp/cflags boost`
++CXXFLAGS += -fPIC -g -O2 -Wall `rosboost-cfg --cflags`
MAJOR_VERSION = 3.9
MINOR_VERSION = 0
Modified: pkg/trunk/3rdparty/kni-3.9.2/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/kni-3.9.2/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/kni-3.9.2/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -3,7 +3,6 @@
<description>Control library and demos for the Katana arm</description>
<license>GPL</license>
<review status="3rdparty" notes=""/>
- <depend package="boost"/>
<url>http://www.neuronics.ch</url>
<export>
<cpp cflags="-I${prefix}/KNI_3.9.2/include" lflags="-L${prefix}/KNI_3.9.2/lib/linux -lKNI_LM -lKNI_InvKin -lKNIBase"/>
Modified: pkg/trunk/3rdparty/libsunflower/Makefile
===================================================================
--- pkg/trunk/3rdparty/libsunflower/Makefile 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/libsunflower/Makefile 2009-01-24 06:07:08 UTC (rev 10133)
@@ -28,7 +28,7 @@
BUILD_DIR= $(PWD)/build
INST_DIR= $(PWD)/local
ESTAR_DIR= `rospack find estar`/local
-BOOST_DIR= `rospack cflags-only-I boost`
+BOOST_DIR= `rosboost-cfg --include_dirs`
SVN_DIR= $(PWD)/build/sunflower-svn
SVN_URL= https://libsunflower.svn.sourceforge.net/svnroot/libsunflower/trunk/sunflower
Modified: pkg/trunk/3rdparty/nepumuk/Makefile
===================================================================
--- pkg/trunk/3rdparty/nepumuk/Makefile 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/nepumuk/Makefile 2009-01-24 06:07:08 UTC (rev 10133)
@@ -32,7 +32,7 @@
INST_DIR= $(PWD)/local
ESTAR_DIR= `rospack find estar`/local
SFL_DIR= `rospack find libsunflower`/local
-BOOST_DIR= `rospack cflags-only-I boost`
+BOOST_DIR= `rosboost-cfg --include_dirs`
SVN_DIR= $(PWD)/build/nepumuk-svn
SVN_URL= https://libsunflower.svn.sourceforge.net/svnroot/libsunflower/trunk/nepumuk
Modified: pkg/trunk/3rdparty/nepumuk/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/nepumuk/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/nepumuk/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -11,7 +11,6 @@
<url>http://libsunflower.sourceforge.net/</url>
<depend package="roscpp"/>
<depend package="std_msgs"/>
- <depend package="boost"/>
<depend package="libsunflower"/>
<sysdepend os="debian" version="4.0-etch" package="libpng12-dev"/>
<sysdepend os="debian" version="4.0-etch" package="autoconf"/>
Modified: pkg/trunk/3rdparty/ogre/Makefile
===================================================================
--- pkg/trunk/3rdparty/ogre/Makefile 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/ogre/Makefile 2009-01-24 06:07:08 UTC (rev 10133)
@@ -5,7 +5,7 @@
TARBALL_URL = http://pr.willowgarage.com/downloads/$(OGRE_VERSION).tar.bz2
SOURCE_DIR = build/$(OGRE_VERSION)
UNPACK_CMD = tar xf
-TARBALL_PATCH = warnings.patch
+TARBALL_PATCH = warnings.patch boost.patch
INITIAL_DIR = build/ogre
include $(shell rospack find mk)/download_unpack_build.mk
@@ -16,12 +16,12 @@
$(shell rospack --lang=cpp --attrib=cflags export freeimage) \
$(shell rospack --lang=cpp --attrib=cflags export opende) \
$(shell rospack --lang=cpp --attrib=cflags export Cg) \
- $(shell rospack --lang=cpp --attrib=cflags export boost)
+ $(shell rosboost-cfg --cflags)
LFLAGS = $(shell rospack --lang=cpp --attrib=lflags export freeimage) \
$(shell rospack --lang=cpp --attrib=lflags export opende) \
$(shell rospack --lang=cpp --attrib=lflags export Cg) \
- $(shell rospack --lang=cpp --attrib=lflags export boost) \
+ $(shell rosboost-cfg --lflags thread) \
-lpthread
CONFIGURE_FLAGS = --prefix=$(OGREROOT) --enable-threading --with-pic --with-platform=GLX --with-gui=gtk --disable-ogre-demos --with-arch=nocona --enable-release
Added: pkg/trunk/3rdparty/ogre/boost.patch
===================================================================
--- pkg/trunk/3rdparty/ogre/boost.patch (rev 0)
+++ pkg/trunk/3rdparty/ogre/boost.patch 2009-01-24 06:07:08 UTC (rev 10133)
@@ -0,0 +1,14 @@
+--- configure 2009-01-22 16:02:27.000000000 -0800
++++ configure-noboosterror 2009-01-22 16:02:22.000000000 -0800
+@@ -25777,11 +25777,6 @@
+ echo "${ECHO_T}$ac_cv_lib_boost_thread_mt_main" >&6
+ if test $ac_cv_lib_boost_thread_mt_main = yes; then
+ OGRE_THREAD_LIBS="-lboost_thread-mt"
+-else
+-
+- { { echo "$as_me:$LINENO: error: You need the C++ boost libraries." >&5
+-echo "$as_me: error: You need the C++ boost libraries." >&2;}
+- { (exit 1); exit 1; }; }
+ fi
+
+ fi
Modified: pkg/trunk/3rdparty/ogre/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/ogre/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/ogre/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -10,7 +10,6 @@
<url>http://ogre3d.org</url>
<depend package="freeimage"/>
<depend package="Cg"/>
-<depend package="boost"/>
<export>
<cpp lflags="-Wl,-rpath,${prefix}/ogre/lib -L${prefix}/ogre/lib/OGRE `PKG_CONFIG_PATH=${prefix}/ogre/lib/pkgconfig:$PKG_CONFIG_PATH pkg-config --libs OGRE`" cflags="`PKG_CONFIG_PATH=${prefix}/ogre/lib/pkgconfig:$PKG_CONFIG_PATH pkg-config --cflags OGRE`"/>
<doxymaker external="http://ogre3d.org"/>
Modified: pkg/trunk/3rdparty/openrave/Makefile
===================================================================
--- pkg/trunk/3rdparty/openrave/Makefile 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/openrave/Makefile 2009-01-24 06:07:08 UTC (rev 10133)
@@ -8,8 +8,11 @@
.PHONY: openrave
+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)" && export CPATH="$(shell rospack find bullet)/include" && export LD_LIBRARY_PATH=$(shell rospack find bullet)/lib:$(LD_LIBRARY_PATH) && export BOOST_ROOT=$(shell rospack find boost)/boost && mkdir -p build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$(PWD) -DCMAKE_BUILD_TYPE=Release .. && make $(PARALLEL_JOBS) install
+ @cd $(SVN_DIR) && export PATH="$(shell rospack find soqt)/bin:$(shell rospack find opende)/opende/bin:$(PATH)" && export CPATH="$(shell rospack find bullet)/include:$(CPATH)" && export LD_LIBRARY_PATH=$(shell rospack find bullet)/lib:$(LD_LIBRARY_PATH) && mkdir -p build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$(PWD) -DCMAKE_BUILD_TYPE=Release -DBoost_INCLUDE_DIR=$(BOOST_INCLUDE_DIRS) -DBoost_LIBRARY_DIR=$(BOOST_LIBRARY_DIRS) .. && make $(PARALLEL_JOBS) install
touch installed
clean:
Modified: pkg/trunk/3rdparty/openrave/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/openrave/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/3rdparty/openrave/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -14,7 +14,6 @@
<depend package="bullet"/>
<depend package="opende"/>
<depend package="std_msgs"/>
- <depend package="boost"/>
<versioncontrol type="svn" url="https://openrave.svn.sourceforge.net/svnroot/openrave"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libglew-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libglew1.5-dev"/>
Modified: pkg/trunk/calibration/kinematic_calibration/CMakeLists.txt
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/calibration/kinematic_calibration/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -12,11 +12,15 @@
src/unittest_verification.cpp
)
+rospack_add_boost_directories()
+
rospack_add_executable(arm_phasespace_grabber src/arm_phasespace_grabber.cpp)
target_link_libraries(arm_phasespace_grabber kinematic_calibration)
+rospack_link_boost(arm_phasespace_grabber thread)
rospack_add_executable(sensor_kinematics_grabber src/sensor_kinematics_grabber.cpp)
target_link_libraries(sensor_kinematics_grabber kinematic_calibration)
+rospack_link_boost(sensor_kinematics_grabber thread)
# ********** Tests **********
rospack_add_gtest(test/jacobian_unittest test/jacobian_unittest.cpp)
Modified: pkg/trunk/calibration/kinematic_calibration/manifest.xml
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/calibration/kinematic_calibration/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -11,7 +11,6 @@
<depend package="topic_synchronizer" />
<depend package="image_msgs" />
<depend package="newmat10"/>
- <depend package="boost"/>
<depend package="pr2_mechanism_controllers" />
# For Scripts
Modified: pkg/trunk/calibration/wheel_odometry_calibration/CMakeLists.txt
===================================================================
--- pkg/trunk/calibration/wheel_odometry_calibration/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/calibration/wheel_odometry_calibration/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -2,4 +2,7 @@
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(wheel_odometry_calibration)
genmsg()
+
rospack_add_executable(wheel_odometry_calibration src/odom_calib.cpp)
+rospack_add_boost_directories()
+rospack_link_boost(wheel_odometry_calibration thread)
Modified: pkg/trunk/calibration/wheel_odometry_calibration/manifest.xml
===================================================================
--- pkg/trunk/calibration/wheel_odometry_calibration/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/calibration/wheel_odometry_calibration/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -7,5 +7,4 @@
<depend package="std_msgs" />
<depend package="roscpp" />
<depend package="pr2_mechanism_controllers" />
- <depend package="boost" />
</package>
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/CMakeLists.txt
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -5,6 +5,8 @@
gensrv()
#rospack_add_library(pr2_controllers src/base_controller.cpp src/laser_scanner_controller.cpp src/arm_position_controller.cpp src/arm_velocity_controller.cpp src/arm_pd_controller.cpp src/head_pan_tilt_controller.cpp)
+rospack_add_boost_directories()
+
rospack_add_library( pr2_mechanism_controllers
src/base_controller.cpp
src/base_controller_pos.cpp
@@ -23,6 +25,7 @@
src/gripper_calibration_controller.cpp
src/arm_trajectory_controller.cpp
)
+rospack_link_boost(pr2_mechanism_controllers thread)
#rospack_add_executable(testBaseController test/test_base_controller.cpp)
#target_link_libraries(testBaseController pr2_mechanism_controllers)
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -18,7 +18,6 @@
<depend package="robot_kinematics" />
<depend package="rosconsole" />
<depend package="trajectory" />
- <depend package="boost" />
<depend package="angles" />
<depend package="control_toolbox" />
<depend package="filters" />
Modified: pkg/trunk/deprecated/cv_wrappers/CMakeLists.txt
===================================================================
--- pkg/trunk/deprecated/cv_wrappers/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/cv_wrappers/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -3,14 +3,18 @@
rospack(cv_wrappers)
+rospack_add_boost_directories()
+
genmsg()
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
# cv_view* (note: does not include cv_view in service/)
rospack_add_executable(cv_view src/cv_view.cpp)
+rospack_link_boost(cv_view thread)
rospack_add_executable(cv_view_minimal minimal/cv_view.cpp)
rospack_add_executable(cv_view_array src/cv_view_array.cpp)
+rospack_link_boost(cv_view_array thread)
rospack_add_executable(cv_view_dcam dcam/cv_view.cpp)
# cv_movie_streamer
Modified: pkg/trunk/deprecated/cv_wrappers/manifest.xml
===================================================================
--- pkg/trunk/deprecated/cv_wrappers/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/cv_wrappers/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -25,7 +25,6 @@
<depend package="image_msgs"/>
<depend package="image_utils"/>
<depend package="roscpp"/>
- <depend package="boost"/>
<depend package="color_calib"/>
<export>
<cpp cflags="-I${prefix}/msg/cpp" />
Modified: pkg/trunk/deprecated/libTF/CMakeLists.txt
===================================================================
--- pkg/trunk/deprecated/libTF/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/libTF/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -2,7 +2,10 @@
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(libTF)
+rospack_add_boost_directories()
+
rospack_add_library(oldTF src/libTF.cpp src/Pose3DCache.cpp src/Pose3D.cpp)
+rospack_link_boost(oldTF thread)
rospack_add_executable(simpletest src/test/main.cpp)
target_link_libraries(simpletest oldTF)
rospack_add_executable(testtf src/test/testtf.cc)
Modified: pkg/trunk/deprecated/libTF/manifest.xml
===================================================================
--- pkg/trunk/deprecated/libTF/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/libTF/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -10,11 +10,10 @@
<url>http://pr.willowgarage.com</url>
<depend package="newmat10"/>
<depend package="ros_exception"/>
-<depend package="boost"/>
<depend package="angles"/>
<depend package="std_msgs"/>
<depend package="roscpp"/>
<export>
-<cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -loldTF"/>
+<cpp cflags="-I${prefix}/include `rosboost-cfg --cflags`" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -loldTF `rosboost-cfg --lflags thread`"/>
</export>
</package>
Modified: pkg/trunk/deprecated/misc_utils/CMakeLists.txt
===================================================================
--- pkg/trunk/deprecated/misc_utils/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/misc_utils/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 2.4.6)
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(misc_utils)
+
add_definitions(-Wall)
rospack_add_gtest(ring_buffer_test test/test_ring_buffer.cpp)
Modified: pkg/trunk/deprecated/misc_utils/manifest.xml
===================================================================
--- pkg/trunk/deprecated/misc_utils/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/misc_utils/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -9,9 +9,8 @@
<review status="unreviewed" notes="API review in progress (Stu)"/>
<url>http://pr.willowgarage.com</url>
<depend package="roscpp" />
- <depend package="boost" />
<export>
- <cpp cflags="-I${prefix}/include" />
+ <cpp cflags="-I${prefix}/include `rosboost-cfg --cflags`" lflags="`rosboost-cfg --lflags thread`" />
</export>
</package>
Modified: pkg/trunk/deprecated/random_utils/CMakeLists.txt
===================================================================
--- pkg/trunk/deprecated/random_utils/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/random_utils/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -1,6 +1,10 @@
cmake_minimum_required(VERSION 2.4.6)
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(random_utils)
+
+rospack_add_boost_directories()
+
rospack_add_library(random_utils src/random_utils.cpp)
+rospack_link_boost(random_utils thread)
rospack_add_executable(test_random_utils src/test.cpp)
target_link_libraries(test_random_utils random_utils)
Modified: pkg/trunk/deprecated/random_utils/manifest.xml
===================================================================
--- pkg/trunk/deprecated/random_utils/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/random_utils/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -2,8 +2,7 @@
<license>BSD</license>
<review status="deprecated" notes=""/>
<author>Morgan Quigley, Ioan Sucan</author>
- <depend package="boost" />
<export>
- <cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lrandom_utils"/>
+ <cpp cflags="-I${prefix}/include `rosboost-cfg --cflags`" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lrandom_utils `rosboost-cfg --lflags thread`"/>
</export>
</package>
Modified: pkg/trunk/deprecated/resource_locator/CMakeLists.txt
===================================================================
--- pkg/trunk/deprecated/resource_locator/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/resource_locator/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -1,7 +1,8 @@
cmake_minimum_required(VERSION 2.4.6)
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(resource_locator)
+
+rospack_add_boost_directories()
+
rospack_add_library(resource_locator src/reslocator.cpp)
-set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
-
-target_link_libraries(resource_locator -lboost_regex-mt)
+rospack_link_boost(resource_locator regex)
Modified: pkg/trunk/deprecated/resource_locator/manifest.xml
===================================================================
--- pkg/trunk/deprecated/resource_locator/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/resource_locator/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -10,7 +10,6 @@
<review status="deprecated" notes="replaced by mechanism_model + xacro"/>
<depend package="rosconsole" />
- <depend package="boost"/>
<export>
<cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lresource_locator"/>
Modified: pkg/trunk/deprecated/scan_utils/CMakeLists.txt
===================================================================
--- pkg/trunk/deprecated/scan_utils/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/scan_utils/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -4,6 +4,8 @@
add_definitions(-Wall)
genmsg()
+rospack_add_boost_directories()
+
# Where's a better place to get this list of libraries?
set(vtk_libs vtkRendering vtkGraphics vtkImaging vtkIO vtkFiltering vtkCommon vtksys pthread dl m vtkDICOMParser vtkftgl vtkHybrid vtkFiltering vtkGraphics)
@@ -11,6 +13,7 @@
target_link_libraries(scanutils ${vtk_libs})
rospack_add_library(listennode src/listen_node/scanListenNode.cpp src/listen_node/rosSystemCalls.cpp)
target_link_libraries(listennode ${vtk_libs} scanutils)
+rospack_link_boost(listennode thread)
rospack_add_executable(cloudToOctree src/cloudToOctree/cloudToOctree.cpp)
target_link_libraries(cloudToOctree scanutils ${vtk_libs})
Modified: pkg/trunk/deprecated/scan_utils/manifest.xml
===================================================================
--- pkg/trunk/deprecated/scan_utils/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/deprecated/scan_utils/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -4,7 +4,6 @@
<license>BSD</license>
<review status="deprecated" notes=""/>
<depend package="roscpp" />
-<depend package="boost" />
<depend package="std_msgs" />
<depend package="newmat10" />
<depend package="libTF" />
Modified: pkg/trunk/drivers/cam/axis_cam/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/cam/axis_cam/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/cam/axis_cam/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -6,16 +6,21 @@
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+rospack_add_boost_directories()
+
rospack_add_library(axis src/libaxis_cam/axis_cam.cpp)
rospack_add_executable(axis_cam src/axis_cam/axis_cam.cpp)
target_link_libraries(axis_cam axis curl)
+rospack_link_boost(axis_cam thread)
rospack_add_executable(axis_ptz src/axis_ptz/axis_ptz.cpp)
target_link_libraries(axis_ptz axis curl)
+rospack_link_boost(axis_ptz thread)
rospack_add_executable(axis_demo src/axis_demo/axis_demo.cpp)
target_link_libraries(axis_demo axis curl)
+rospack_link_boost(axis_demo thread)
add_subdirectory(src/libaxis_cam/demo)
Modified: pkg/trunk/drivers/cam/axis_cam/manifest.xml
===================================================================
--- pkg/trunk/drivers/cam/axis_cam/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/cam/axis_cam/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -15,7 +15,6 @@
<depend package="roscpp"/>
<depend package="std_msgs"/>
<depend package="std_srvs"/>
-<depend package="boost"/>
<depend package="string_utils"/>
<depend package="image_utils"/>
<depend package="self_test"/>
Added: pkg/trunk/drivers/input/joy_annotator/joy_node.cpp
===================================================================
--- pkg/trunk/drivers/input/joy_annotator/joy_node.cpp (rev 0)
+++ pkg/trunk/drivers/input/joy_annotator/joy_node.cpp 2009-01-24 06:07:08 UTC (rev 10133)
@@ -0,0 +1,129 @@
+#include <unistd.h>
+#include <math.h>
+#include "ros/node.h"
+#include "joy/Joy.h"
+#include <sstream>
+#include <string>
+#include <std_msgs/String.h>
+
+#include <map>
+#include <iostream>
+#include <fstream>
+
+// This should really go in the .msg
+#define MAX_BUTTONS 8
+
+using namespace std;
+using namespace ros;
+using namespace joy;
+
+class JoyNode : public Node
+{
+ public:
+ joy::Joy joy_msg;
+ pthread_t joy_thread;
+ std_msgs::String joy_string;
+ std::stringstream cur_string;
+
+ int reset_button;
+ int send_button;
+
+ bool map_available_;
+ std::map<std::string,std::string>cmd_map_;
+ std::map<std::string,std::string>::const_iterator find_iter_;
+
+ JoyNode() : Node("joy_node")
+ {
+ advertise<std_msgs::String>("joy_button",1);
+ param<int>("joy_node/reset_button",reset_button,6);
+ param<int>("joy_node/send_button",send_button,8);
+ subscribe("joy",joy_msg,&JoyNode::joyMsgReceived,this,1);
+ reset_button -= 1;
+ send_button -= 1;
+ map_available_ = false;
+ }
+ void start()
+ {
+ }
+ void stop()
+ {
+ unadvertise("joy_button");
+ unsubscribe("joy");
+ }
+ void readMap(char *filename)
+ {
+ std::ifstream myfile;
+ myfile.open(filename);
+ string s1,s2;
+ if(!myfile)
+ {
+ fprintf(stderr,"Unable to open file.\n");
+ return;
+ }
+ else
+ {
+ fprintf(stderr,"Opened file\n");
+ map_available_ = true;
+ while(myfile >> s1 >> s2)
+ {
+ cmd_map_[s1] = s2;
+ cout << "Mapped button sequence " << s1 << " to " << s2 << endl;
+ }
+ myfile.close();
+ }
+ }
+ void joyMsgReceived()
+ {
+ if(joy_msg.buttons[send_button])
+ {
+ joy_string.data = cur_string.str();
+ if(map_available_)
+ {
+ find_iter_ = cmd_map_.find(cur_string.str());
+ if(find_iter_ != cmd_map_.end())
+ {
+ joy_string.data = find_iter_->second;
+ cout << "Found string message match" << endl;
+ }
+ }
+ cout << "Message sent: " << joy_string.data << endl;
+ publish("joy_button",joy_string);
+ cur_string.str("");
+ }
+ else if(joy_msg.buttons[reset_button])
+ {
+ cur_string.str("");
+ cout << "Message reset" << endl;
+ }
+ else
+ {
+ for(int i=0 ; i<MAX_BUTTONS; i++)
+ {
+ if(i == send_button || i == reset_button)
+ continue;
+ if(joy_msg.buttons[i])
+ {
+ cur_string << (i+1);
+ cout << "Current message string: " << cur_string.str() << endl;
+ break;
+ }
+ }
+ }
+ };
+};
+
+int main(int argc, char **argv)
+{
+ ros::init(argc, argv);
+ JoyNode joy;
+ if(argc == 2)
+ {
+ joy.readMap(argv[1]);
+ }
+ joy.start();
+ joy.spin();
+ joy.stop();
+ ros::fini();
+ return 0;
+}
+
Modified: pkg/trunk/drivers/laser/laser_scan_annotator/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/laser/laser_scan_annotator/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/laser/laser_scan_annotator/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -3,6 +3,8 @@
rospack(laser_scan_annotator)
genmsg()
+rospack_add_boost_directories()
+
rospack_add_executable(laser_scan_annotator_node src/laser_scan_annotator_node.cpp)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
Modified: pkg/trunk/drivers/laser/laser_scan_annotator/manifest.xml
===================================================================
--- pkg/trunk/drivers/laser/laser_scan_annotator/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/laser/laser_scan_annotator/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -9,7 +9,6 @@
<depend package="std_msgs"/>
<depend package="roscpp"/>
<depend package="tf"/>
-<depend package="boost"/>
<export>
<cpp cflags="-I${prefix}/msg/cpp"/>
</export>
Modified: pkg/trunk/drivers/motor/ethercat_hardware/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/motor/ethercat_hardware/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/motor/ethercat_hardware/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -3,6 +3,9 @@
rospack(ethercat_hardware)
genmsg()
gensrv()
+
+rospack_add_boost_directories()
+
add_definitions(-Wall)
rospack_add_library(ethercat_hardware src/ethercat_hardware.cpp src/wg0x.cpp src/ek1122.cpp src/wg014.cpp)
rospack_add_executable(motorconf src/motorconf.cpp src/ethercat_hardware.cpp src/wg0x.cpp src/ek1122.cpp src/wg014.cpp)
Modified: pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml
===================================================================
--- pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -14,7 +14,6 @@
<depend package='realtime_tools' />
<depend package='robot_msgs' />
<depend package='xenomai' />
-<depend package='boost' />
<export>
<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lethercat_hardware -Wl,-rpath,${prefix}/lib"/>
</export>
Modified: pkg/trunk/drivers/robot/ipdcmot/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/robot/ipdcmot/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/robot/ipdcmot/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -1,7 +1,12 @@
cmake_minimum_required(VERSION 2.4.6)
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(ipdcmot)
+
+rospack_add_boost_directories()
+
rospack_add_library(ipdcmot src/libipdcmot/ipdcmot.cpp)
+rospack_link_boost(ipdcmot thread)
+
rospack_add_executable(test/test_patrol/test_patrol test/test_patrol/test_patrol.cpp)
target_link_libraries(test/test_patrol/test_patrol ipdcmot)
rospack_add_executable(test/test_position/test_position test/test_position/test_position.cpp)
Modified: pkg/trunk/drivers/robot/ipdcmot/manifest.xml
===================================================================
--- pkg/trunk/drivers/robot/ipdcmot/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/robot/ipdcmot/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -7,7 +7,6 @@
<review status="unreviewed" notes=""/>
<url>http://stair.stanford.edu</url>
<depend package="roscpp"/>
-<depend package="boost"/>
<export>
<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -Wl,-rpath,${prefix}/lib -lipdcmot"/>
</export>
Modified: pkg/trunk/drivers/robot/pr2/point_cloud_assembler/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/robot/pr2/point_cloud_assembler/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/robot/pr2/point_cloud_assembler/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -3,6 +3,8 @@
rospack(point_cloud_assembler)
gensrv()
+rospack_add_boost_directories()
+
rospack_add_executable(laser_scan_assembler_srv src/laser_scan_assembler_srv.cpp)
rospack_add_executable(point_cloud_assembler_srv src/point_cloud_assembler_srv.cpp)
rospack_add_executable(grab_cloud_data src/grab_cloud_data.cpp)
@@ -10,8 +12,9 @@
rospack_add_executable(test_assembler
test/test_assembler.cpp)
+rospack_link_boost(test_assembler thread)
rospack_add_rostest(${CMAKE_CURRENT_SOURCE_DIR}/test/test_laser_assembler.launch)
rospack_add_rostest(${CMAKE_CURRENT_SOURCE_DIR}/test/test_cloud_assembler.launch)
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
\ No newline at end of file
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
Modified: pkg/trunk/drivers/robot/pr2/point_cloud_assembler/manifest.xml
===================================================================
--- pkg/trunk/drivers/robot/pr2/point_cloud_assembler/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/robot/pr2/point_cloud_assembler/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -11,7 +11,6 @@
<depend package="laser_scan"/>
<depend package="tf"/>
<depend package="pr2_mechanism_controllers"/>
- <depend package="boost" />
# For Testing
<depend package="rostest"/>
Modified: pkg/trunk/drivers/robot/pr2/pr2_power_board/manifest.xml
===================================================================
--- pkg/trunk/drivers/robot/pr2/pr2_power_board/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/robot/pr2/pr2_power_board/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -6,5 +6,4 @@
<depend package="roscpp" />
<depend package="rospy" />
<depend package="robot_msgs" />
- <depend package="boost" />
</package>
Modified: pkg/trunk/drivers/robot/pr2/pr2_power_board/src/power_node/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/robot/pr2/pr2_power_board/src/power_node/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/robot/pr2/pr2_power_board/src/power_node/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -1,2 +1,4 @@
rospack_add_executable(power_node power_node.cpp)
-target_link_libraries(power_node boost_thread-mt)
+
+rospack_add_boost_directories()
+rospack_link_boost(power_node thread)
Modified: pkg/trunk/drivers/robot/segway_apox/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/robot/segway_apox/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/robot/segway_apox/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -2,3 +2,5 @@
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(segway_apox)
rospack_add_executable(segway_apox segway.cpp serial.c usbcan.c)
+rospack_add_boost_directories()
+rospack_link_boost(segway_apox thread)
Modified: pkg/trunk/drivers/robot/segway_apox/manifest.xml
===================================================================
--- pkg/trunk/drivers/robot/segway_apox/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/robot/segway_apox/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -5,6 +5,5 @@
<depend package="std_msgs"/>
<depend package="roscpp"/>
<depend package="tf"/>
- <depend package="boost"/>
</package>
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -9,17 +9,30 @@
add_definitions(-fPIC)
set(ROS_BUILD_TYPE Release)
+rospack_add_boost_directories()
+
rospack_add_library(ros_stereo_camera src/ros_stereo_camera.cpp)
+rospack_link_boost(ros_stereo_camera thread)
rospack_add_library(ros_camera src/ros_camera.cpp)
+rospack_link_boost(ros_camera thread)
rospack_add_library(ros_laser src/ros_laser.cpp)
+rospack_link_boost(ros_laser thread)
rospack_add_library(ros_block_laser src/ros_block_laser.cpp)
+rospack_link_boost(ros_block_laser thread)
rospack_add_library(ros_time src/ros_time.cpp)
+rospack_link_boost(ros_time thread)
rospack_add_library(ros_ptz src/ros_ptz.cpp)
+rospack_link_boost(ros_ptz thread)
rospack_add_library(ros_p3d src/ros_p3d.cpp)
+rospack_link_boost(ros_p3d thread)
rospack_add_library(ros_f3d src/ros_f3d.cpp)
+rospack_link_boost(ros_f3d thread)
rospack_add_library(gazebo_mechanism_control src/gazebo_mechanism_control.cpp)
+rospack_link_boost(gazebo_mechanism_control thread)
rospack_add_library(gazebo_battery src/gazebo_battery.cpp)
+rospack_link_boost(gazebo_battery thread)
rospack_add_library(ros_bumper src/ros_bumper.cpp)
+rospack_link_boost(ros_bumper thread)
rospack_add_rostest(test/test_slide.xml)
rospack_add_rostest(test/test_base.xml)
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -16,7 +16,6 @@
<depend package="std_msgs" />
<depend package="pr2_msgs" />
<depend package="robot_msgs" />
- <depend package="boost"/>
<depend package="stl_utils" />
<depend package="angles" />
<depend package="gazebo_robot_description"/>
@@ -26,7 +25,6 @@
<depend package="tinyxml" />
<depend package="axis_cam" />
<depend package="bullet" />
- <depend package="boost" />
<depend package="wg_robot_description_parser" />
<export>
<cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib" />
Modified: pkg/trunk/estimation/robot_pose_ekf/CMakeLists.txt
===================================================================
--- pkg/trunk/estimation/robot_pose_ekf/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/estimation/robot_pose_ekf/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -2,12 +2,17 @@
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(robot_pose_ekf)
genmsg()
+
+rospack_add_boost_directories()
+
rospack_add_executable(robot_pose_ekf
src/odom_estimation.cpp
src/nonlinearanalyticconditionalgaussianodo.cpp
src/odom_estimation_node.cpp)
+rospack_link_boost(robot_pose_ekf thread)
rospack_add_executable(test/test_ekf
test/test_ekf.cpp)
+rospack_link_boost(test/test_ekf thread)
rospack_add_rostest(${CMAKE_CURRENT_SOURCE_DIR}/test/test_ekf.launch)
Modified: pkg/trunk/estimation/robot_pose_ekf/manifest.xml
===================================================================
--- pkg/trunk/estimation/robot_pose_ekf/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/estimation/robot_pose_ekf/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -7,7 +7,6 @@
<depend package="std_msgs" />
<depend package="robot_msgs" />
<depend package="tf" />
-<depend package="boost"/>
<depend package="gtest"/>
<depend package="rosrecord"/>
</package>
Modified: pkg/trunk/hardware_test/self_test/CMakeLists.txt
===================================================================
--- pkg/trunk/hardware_test/self_test/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/hardware_test/self_test/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -4,6 +4,9 @@
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+rospack_add_boost_directories()
+
rospack_add_executable(run_selftest src/run_selftest.cpp)
+rospack_link_boost(run_selftest thread)
rospack_add_executable(selftest_example src/selftest_example.cpp)
-
+rospack_link_boost(selftest_example thread)
Modified: pkg/trunk/hardware_test/self_test/manifest.xml
===================================================================
--- pkg/trunk/hardware_test/self_test/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/hardware_test/self_test/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -4,7 +4,6 @@
<license>BSD</license>
<review status="unreviewed" notes="proposal (Jeremy)"/>
<depend package="roscpp" />
- <depend package="boost" />
<depend package="robot_srvs" />
<export>
<cpp cflags="-I${prefix}/include"/>
Modified: pkg/trunk/highlevel/executive_trex/executive_trex_pr2/CMakeLists.txt
===================================================================
--- pkg/trunk/highlevel/executive_trex/executive_trex_pr2/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/highlevel/executive_trex/executive_trex_pr2/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -3,6 +3,7 @@
#set(ROS_BUILD_TYPE Release)
rospack(executive_trex_pr2)
+rospack_add_boost_directories()
execute_process(
COMMAND rospack find trex
@@ -41,6 +42,7 @@
# but gives good feedback in discovering problems.
rospack_add_executable(bin/trexdebug ${TREX_FILES})
target_link_libraries(bin/trexdebug Utils_g TREX_g)
+rospack_link_boost(bin/trexdebug thread)
rospack_add_gtest_build_flags(bin/trexdebug)
# rospack_add_gtest_build_flags excludes the target from all, on the
# assumption that it's only used as a unit test. In this case that's not
@@ -51,6 +53,7 @@
# trexfast is about an order of magnitude faster than trexdebug
rospack_add_executable(bin/trexfast ${TREX_FILES})
target_link_libraries(bin/trexfast Utils_o TREX_o)
+rospack_link_boost(bin/trexfast thread)
rospack_add_gtest_build_flags(bin/trexfast)
# rospack_add_gtest_build_flags excludes the target from all, on the
# assumption that it's only used as a unit test. In this case that's not
Modified: pkg/trunk/highlevel/executive_trex/executive_trex_pr2/manifest.xml
===================================================================
--- pkg/trunk/highlevel/executive_trex/executive_trex_pr2/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/highlevel/executive_trex/executive_trex_pr2/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -5,7 +5,6 @@
<review status="unreviewed" notes=""/>
<depend package="trex" />
<depend package="roscpp"/>
- <depend package="boost"/>
<depend package="rosconsole"/>
<depend package="rospy" />
<depend package="highlevel_controllers" />
Modified: pkg/trunk/highlevel/highlevel_controllers/CMakeLists.txt
===================================================================
--- pkg/trunk/highlevel/highlevel_controllers/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/highlevel/highlevel_controllers/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -8,31 +8,40 @@
add_definitions(-Wall)
rospack(highlevel_controllers)
+rospack_add_boost_directories()
+
genmsg()
# Library
rospack_add_library(highlevel_controllers src/move_base.cpp src/velocity_controllers.cpp)
target_link_libraries(highlevel_controllers trajectory_rollout costmap_2d)
+rospack_link_boost(highlevel_controllers thread)
# MoveArm
# Eventually move_arm2 will replace move_arm
#rospack_add_executable(move_arm src/move_arm.cpp)
+#rospack_link_boost(move_arm thread)
rospack_add_executable(move_arm2 src/move_arm2.cpp)
+rospack_link_boost(move_arm2 thread)
# move_base_sbpl
rospack_add_executable(move_base_sbpl src/move_base_sbpl.cpp)
target_link_libraries(move_base_sbpl highlevel_controllers mpglue)
+rospack_link_boost(move_base_sbpl thread)
# move_base_navfn
rospack_add_executable(move_base_navfn src/move_base_navfn.cpp)
target_link_libraries(move_base_navfn highlevel_controllers navfn)
+rospack_link_boost(move_base_navfn thread)
# move_base_topological
rospack_add_executable(move_base_topological src/move_base_topological.cpp)
target_link_libraries(move_base_topological highlevel_controllers topological_map)
+rospack_link_boost(move_base_topological thread)
# MoveArmEndEffector
rospack_add_executable(move_end_effector src/move_end_effector.cpp)
+rospack_link_boost(move_end_effector thread)
#Joystick Sleep Button
rospack_add_executable(joy_batt_sender src/joy_batt_sender.cpp)
@@ -43,3 +52,4 @@
#CLI
# Disabled, pending update to new message formats
#rospack_add_executable(cli src/control_cli.cpp)
+#rospack_link_boost(cli thread)
Modified: pkg/trunk/highlevel/highlevel_controllers/manifest.xml
===================================================================
--- pkg/trunk/highlevel/highlevel_controllers/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/highlevel/highlevel_controllers/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -10,7 +10,6 @@
<url>http://pr.willowgarage.com</url>
<depend package="roscpp"/>
- <depend package="boost"/>
<depend package="rosconsole"/>
<depend package="std_msgs"/>
<depend package="robot_msgs"/>
Modified: pkg/trunk/mechanism/mechanism_control/CMakeLists.txt
===================================================================
--- pkg/trunk/mechanism/mechanism_control/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/mechanism/mechanism_control/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -1,7 +1,11 @@
cmake_minimum_required(VERSION 2.4.6)
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(mechanism_control)
+
+rospack_add_boost_directories()
+
rospack_add_library(mechanism_control src/mechanism_control.cpp)
+rospack_link_boost(mechanism_control thread)
#rospack_add_executable(ms_publisher_test test/ms_publisher_test.cpp)
#rospack_add_rostest(test/test-mechanism-state-cpp.xml)
#rospack_add_rostest(test/test-mechanism-state-py.xml)
Modified: pkg/trunk/mechanism/mechanism_control/manifest.xml
===================================================================
--- pkg/trunk/mechanism/mechanism_control/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/mechanism/mechanism_control/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -5,7 +5,6 @@
<license>BSD</license>
<review status="unreviewed" notes=""/>
<url>http://pr.willowgarage.com</url>
-<depend package="boost"/>
<depend package="roscpp" />
<depend package="hardware_interface"/>
<depend package="tinyxml"/>
Modified: pkg/trunk/motion_planning/kinematic_planning/CMakeLists.txt
===================================================================
--- pkg/trunk/motion_planning/kinematic_planning/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/motion_planning/kinematic_planning/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -2,10 +2,16 @@
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(kinematic_planning)
+rospack_add_boost_directories()
+
genmsg()
rospack_add_executable(kinematic_planning src/kinematic_planning.cpp)
rospack_add_executable(motion_validator src/motion_validator.cpp)
rospack_add_executable(state_validity_monitor src/state_validity_monitor.cpp)
+rospack_link_boost(kinematic_planning thread)
+rospack_link_boost(motion_validator thread)
+rospack_link_boost(state_validity_monitor thread)
+
add_subdirectory(test)
Modified: pkg/trunk/motion_planning/kinematic_planning/manifest.xml
===================================================================
--- pkg/trunk/motion_planning/kinematic_planning/manifest.xml 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/motion_planning/kinematic_planning/manifest.xml 2009-01-24 06:07:08 UTC (rev 10133)
@@ -6,7 +6,6 @@
<depend package="roscpp" />
<depend package="rosconsole" />
<depend package="tf" />
- <depend package="boost" />
<depend package="std_msgs" />
<depend package="std_srvs" />
Modified: pkg/trunk/nav/nav_view_sdl/CMakeLists.txt
===================================================================
--- pkg/trunk/nav/nav_view_sdl/CMakeLists.txt 2009-01-24 06:03:57 UTC (rev 10132)
+++ pkg/trunk/nav/nav_view_sdl/CMakeLists.txt 2009-01-24 06:07:08 UTC (rev 10133)
@@ -1,9 +1,14 @@
cmake_minimum_required(VERSION 2.4.6)
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
rospack(nav_view_sdl)
+
+rospack_add_boost_directories()
+
rospack_add_executable(nav_view nav_view.cpp)
target_link_libraries(nav_view SDL_image)
+rospack_link_boost(nav_view thread)
+
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
set(LIBR...
[truncated message content] |
