Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[7325] pkg/trunk
|
From: <jfa...@us...> - 2008-11-26 02:32:01
|
Revision: 7325
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=7325&view=rev
Author: jfaustwg
Date: 2008-11-26 02:31:51 +0000 (Wed, 26 Nov 2008)
Log Message:
-----------
Remove 3rdparty boost from personalrobots, switch all first-party packages to use the ROS 3rdparty boost
Modified Paths:
--------------
pkg/trunk/3rdparty/bfl_latest/Makefile
pkg/trunk/3rdparty/gazebo/Makefile
pkg/trunk/3rdparty/kdl/Makefile
pkg/trunk/3rdparty/ogre/Makefile
pkg/trunk/drivers/motor/ethercat_hardware/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/openrave_planning/or_rosplanning/manifest.xml
pkg/trunk/util/resource_locator/CMakeLists.txt
pkg/trunk/util/resource_locator/manifest.xml
pkg/trunk/util/tf/CMakeLists.txt
pkg/trunk/util/tf/include/tf/message_notifier.h
pkg/trunk/util/tf/manifest.xml
pkg/trunk/util/tf/test/test_notifier.cpp
pkg/trunk/visualization/ogre_tools/manifest.xml
pkg/trunk/visualization/ogre_visualizer/manifest.xml
pkg/trunk/visualization/wx_rosout/CMakeLists.txt
pkg/trunk/visualization/wx_rosout/manifest.xml
pkg/trunk/visualization/wx_rosout/src/test/send_test.cpp
pkg/trunk/world_models/topological_map/manifest.xml
Added Paths:
-----------
pkg/trunk/3rdparty/ogre/changelist.txt
Removed Paths:
-------------
pkg/trunk/3rdparty/boost/
Modified: pkg/trunk/3rdparty/bfl_latest/Makefile
===================================================================
--- pkg/trunk/3rdparty/bfl_latest/Makefile 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/3rdparty/bfl_latest/Makefile 2008-11-26 02:31:51 UTC (rev 7325)
@@ -4,8 +4,11 @@
SVN_DIR = bfl-svn
INSTALL_DIR = bfl-boost
-CMAKE = `rospack find cmake`/cmake/bin/cmake
+CMAKE = `rospack find cmake`/cmake/bin/cmake
+BOOST_ROOT =$(shell rospack find boost)/boost
CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(PWD)/$(INSTALL_DIR)/ \
+ -DBOOST_INCLUDEDIR:STRING=$(BOOST_ROOT)/include \
+ -DBOOST_LIBRARYDIR:STRING=$(BOOST_ROOT)/lib \
-DMATRIX_LIB=boost \
-DRNG_LIB=boost
PATCH = bfl_patch.diff
Modified: pkg/trunk/3rdparty/gazebo/Makefile
===================================================================
--- pkg/trunk/3rdparty/gazebo/Makefile 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/3rdparty/gazebo/Makefile 2008-11-26 02:31:51 UTC (rev 7325)
@@ -18,12 +18,14 @@
ROOT = $(shell rospack find gazebo)/gazebo
TESTROOT = $(shell rospack find gazebo)/test-gazebo
+BOOST_ROOT = $(shell rospack find boost)/boost
+
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=${ODE_PKG}:${FI_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} PATH=${ODE_PATH}:${PATH} \
+ cd $(SVN_DIR) && PKG_CONFIG_PATH=${ODE_PKG}:${FI_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} PATH=${ODE_PATH}:${PATH} CCFLAGS=-I${BOOST_ROOT}/include \
scons mode=optimized prefix=$(ROOT)
-cd $(SVN_DIR) && PKG_CONFIG_PATH=${ODE_PKG}:${FI_PKG}:${PLAYER_PKG}:${OGRE_PKG}:${PKG_CONFIG_PATH} PATH=${ODE_PATH}:${PATH} \
scons mode=optimized prefix=$(ROOT) install
Modified: pkg/trunk/3rdparty/kdl/Makefile
===================================================================
--- pkg/trunk/3rdparty/kdl/Makefile 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/3rdparty/kdl/Makefile 2008-11-26 02:31:51 UTC (rev 7325)
@@ -17,9 +17,12 @@
include $(shell rospack find mk)/svn_checkout.mk
CMAKE = `rospack find cmake`/cmake/bin/cmake
+BOOST_ROOT =$(shell rospack find boost)/boost
CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(PWD)/kdl/ \
-DPYTHON_BINDINGS=ON \
- -DKDL_PYTHON_INSTALL_PATH=$(PWD)/kdl/lib/
+ -DKDL_PYTHON_INSTALL_PATH=$(PWD)/kdl/lib/ \
+ -DBOOST_INCLUDEDIR:STRING=$(BOOST_ROOT)/include \
+ -DBOOST_LIBRARYDIR:STRING=$(BOOST_ROOT)/lib
build: wiped kdl
Modified: pkg/trunk/3rdparty/ogre/Makefile
===================================================================
--- pkg/trunk/3rdparty/ogre/Makefile 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/3rdparty/ogre/Makefile 2008-11-26 02:31:51 UTC (rev 7325)
@@ -12,30 +12,28 @@
ROOT = $(shell rospack find ogre)
OGREROOT = $(shell rospack find ogre)/ogre
-FIROOT = $(shell rospack find freeimage)/freeimage
-CGROOT = $(shell rospack find Cg)/Cg
-
-CFLAGS = -g \
+CFLAGS = -g -O3 \
$(shell rospack --lang=cpp --attrib=cflags export freeimage) \
- $(shell rospack --lang=cpp --attrib=cflags export player) \
$(shell rospack --lang=cpp --attrib=cflags export opende) \
- $(shell rospack --lang=cpp --attrib=cflags export Cg)
+ $(shell rospack --lang=cpp --attrib=cflags export Cg) \
+ $(shell rospack --lang=cpp --attrib=cflags export boost)
LFLAGS = $(shell rospack --lang=cpp --attrib=lflags export freeimage) \
- $(shell rospack --lang=cpp --attrib=lflags export player) \
$(shell rospack --lang=cpp --attrib=lflags export opende) \
- $(shell rospack --lang=cpp --attrib=lflags export Cg)
+ $(shell rospack --lang=cpp --attrib=lflags export Cg) \
+ $(shell rospack --lang=cpp --attrib=lflags export boost)
-CONFIGURE_FLAGS = --with-arch=nocona --enable-release CXXFLAGS='-g -O3 -I$(FIROOT)/include -I$(CGROOT)/include' LDFLAGS='-Wl,-rpath,$(FIROOT)/lib,-rpath,$(CGROOT)/lib -L$(FIROOT)/lib -L$(CGROOT)/lib' CFLAGS='-g -O3 -I$(FIROOT)/include -I$(OISROOT)/include -I$(CGROOT)/include'
+CONFIGURE_FLAGS = --prefix=$(OGREROOT) --enable-threading --with-pic --with-platform=GLX --with-gui=gtk --disable-ogre-demos --with-arch=nocona --enable-release
-$(SOURCE_DIR)/Makefile: $(SOURCE_DIR)
+$(SOURCE_DIR)/Makefile: $(SOURCE_DIR) changelist.txt
if test `uname` = Darwin ; then \
touch $(SOURCE_DIR)/Makefile; \
else \
cd $(SOURCE_DIR) && \
- export LIB="$(LFLAGS)" && \
+ export LDFLAGS="$(LFLAGS)" && \
export CFLAGS="$(CFLAGS)" && \
- ./configure --prefix=$(OGREROOT) --enable-threading --with-pic --with-platform=GLX --with-gui=gtk --disable-ogre-demos $(CONFIGURE_FLAGS) && \
+ export CXXFLAGS="$(CFLAGS)" && \
+ ./configure $(CONFIGURE_FLAGS) && \
touch $(ROOT)/$(SOURCE_DIR)/Makefile && \
mkdir -p $(ROOT)/ogre && \
mkdir -p $(ROOT)/ogre/lib && \
Added: pkg/trunk/3rdparty/ogre/changelist.txt
===================================================================
--- pkg/trunk/3rdparty/ogre/changelist.txt (rev 0)
+++ pkg/trunk/3rdparty/ogre/changelist.txt 2008-11-26 02:31:51 UTC (rev 7325)
@@ -0,0 +1 @@
+* Added to force reconfig/rebuild
Modified: pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml
===================================================================
--- pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml 2008-11-26 02:31:51 UTC (rev 7325)
@@ -14,11 +14,9 @@
<depend package='misc_utils' />
<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>
<repository>http://pr.willowgarage.com/repos</repository>
-<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
-<sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
</package>
Modified: pkg/trunk/drivers/robot/pr2/pr2_power_board/manifest.xml
===================================================================
--- pkg/trunk/drivers/robot/pr2/pr2_power_board/manifest.xml 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/drivers/robot/pr2/pr2_power_board/manifest.xml 2008-11-26 02:31:51 UTC (rev 7325)
@@ -7,7 +7,5 @@
<depend package="rospy" />
<depend package="rosthread" />
<depend package="robot_msgs" />
- <!--<depend package="boost" />-->
- <sysdepend os="ubuntu" version="8.04-hardy" package="libboost-thread1.34.1"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="libboost-thread-dev"/>
+ <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 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/drivers/robot/pr2/pr2_power_board/src/power_node/CMakeLists.txt 2008-11-26 02:31:51 UTC (rev 7325)
@@ -1,6 +1,2 @@
-FIND_PACKAGE(Boost REQUIRED thread)
-
-
-
rospack_add_executable(power_node power_node.cpp)
-target_link_libraries(power_node ${Boost_LIBRARIES} )
+target_link_libraries(power_node boost_thread-mt)
Modified: pkg/trunk/openrave_planning/or_rosplanning/manifest.xml
===================================================================
--- pkg/trunk/openrave_planning/or_rosplanning/manifest.xml 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/openrave_planning/or_rosplanning/manifest.xml 2008-11-26 02:31:51 UTC (rev 7325)
@@ -8,6 +8,5 @@
<depend package="openrave"/>
<depend package="openrave_robot_description"/>
<depend package="libKinematics"/>
- <sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
+ <depend package="boost"/>
</package>
Modified: pkg/trunk/util/resource_locator/CMakeLists.txt
===================================================================
--- pkg/trunk/util/resource_locator/CMakeLists.txt 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/util/resource_locator/CMakeLists.txt 2008-11-26 02:31:51 UTC (rev 7325)
@@ -4,11 +4,4 @@
rospack_add_library(resource_locator src/reslocator.cpp)
set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
-find_package( Boost COMPONENTS regex )
-if( NOT ${Boost_regex_FOUND} )
- message(SEND_ERROR "could not find boost-regex")
-endif()
-
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-target_link_libraries(resource_locator ${Boost_LIBRARIES})
+target_link_libraries(resource_locator -lboost_regex-mt)
Modified: pkg/trunk/util/resource_locator/manifest.xml
===================================================================
--- pkg/trunk/util/resource_locator/manifest.xml 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/util/resource_locator/manifest.xml 2008-11-26 02:31:51 UTC (rev 7325)
@@ -10,12 +10,9 @@
<review status="unreviewed" notes=""/>
<depend package="rosconsole" />
+ <depend package="boost"/>
<export>
<cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lresource_locator"/>
</export>
-
- <sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-regex-dev"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="libboost-regex-dev"/>
- <sysdepend os="ubuntu" version="8.10-intrepid" package="libboost-regex-dev"/>
</package>
Modified: pkg/trunk/util/tf/CMakeLists.txt
===================================================================
--- pkg/trunk/util/tf/CMakeLists.txt 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/util/tf/CMakeLists.txt 2008-11-26 02:31:51 UTC (rev 7325)
@@ -4,12 +4,8 @@
genmsg()
-find_package(Boost 0 REQUIRED COMPONENTS thread)
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-
rospack_add_library(tf src/tf.cpp src/transform_listener.cpp src/cache.cpp src/message_notifier.cpp)
-target_link_libraries(tf ${Boost_LIBRARIES})
+target_link_libraries(tf boost_thread-mt)
rospack_add_executable(simpletest simpletest.cpp)
target_link_libraries(simpletest tf)
Modified: pkg/trunk/util/tf/include/tf/message_notifier.h
===================================================================
--- pkg/trunk/util/tf/include/tf/message_notifier.h 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/util/tf/include/tf/message_notifier.h 2008-11-26 02:31:51 UTC (rev 7325)
@@ -450,7 +450,7 @@
bool destructing_; ///< Used to notify the worker thread that it needs to shutdown
boost::thread* thread_handle_; ///< Thread handle for the worker thread
- boost::condition new_data_; ///< Condition variable used for waking the worker thread
+ boost::condition_variable new_data_; ///< Condition variable used for waking the worker thread
bool new_messages_; ///< Used to skip waiting on new_data_ if new messages have come in while calling back
volatile bool new_transforms_; ///< Used to skip waiting on new_data_ if new transforms have come in while calling back or transforming data
V_Message new_message_queue_; ///< Queues messages to later be processed by the worker thread
Modified: pkg/trunk/util/tf/manifest.xml
===================================================================
--- pkg/trunk/util/tf/manifest.xml 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/util/tf/manifest.xml 2008-11-26 02:31:51 UTC (rev 7325)
@@ -17,13 +17,8 @@
<depend package="bullet"/>
<depend package="laser_scan_utils"/>
<depend package="rosTF"/> <!-- For backwards compatibility only Fixme remove /-->
-<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
-<sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
-<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-thread-dev"/>
-<sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-thread-dev"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-thread-dev"/>
+<depend package="boost"/>
<export>
-<cpp cflags="-I${prefix}/include -I${prefix}/msg/cpp" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -ltf"/>
+<cpp cflags="-I${prefix}/include -I${prefix}/msg/cpp" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -ltf -lboost_thread-mt"/>
</export>
</package>
Modified: pkg/trunk/util/tf/test/test_notifier.cpp
===================================================================
--- pkg/trunk/util/tf/test/test_notifier.cpp 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/util/tf/test/test_notifier.cpp 2008-11-26 02:31:51 UTC (rev 7325)
@@ -50,14 +50,14 @@
: count_(0)
, expected_count_(expected_count)
{
- boost::detail::thread::lock_ops<boost::timed_mutex>::lock(mutex_);
+ lock_ = new boost::timed_mutex::scoped_lock(mutex_);
}
~Notification()
{
if (count_ < expected_count_)
{
- boost::detail::thread::lock_ops<boost::timed_mutex>::unlock(mutex_);
+ delete lock_;
}
}
@@ -69,13 +69,14 @@
if (count_ == expected_count_)
{
- boost::detail::thread::lock_ops<boost::timed_mutex>::unlock(mutex_);
+ delete lock_;
}
}
int count_;
int expected_count_;
+ boost::timed_mutex::scoped_lock* lock_;
boost::timed_mutex mutex_;
};
@@ -88,7 +89,7 @@
, expected_count_(expected_count)
, topic_(topic)
{
- boost::detail::thread::lock_ops<boost::timed_mutex>::lock(mutex_);
+ lock_ = new boost::timed_mutex::scoped_lock(mutex_);
g_node->subscribe(topic_, message_, &Counter::callback, this, 0);
}
@@ -99,7 +100,7 @@
if (count_ < expected_count_)
{
- boost::detail::thread::lock_ops<boost::timed_mutex>::unlock(mutex_);
+ delete lock_;
}
}
@@ -111,7 +112,7 @@
if (count_ == expected_count_)
{
- boost::detail::thread::lock_ops<boost::timed_mutex>::unlock(mutex_);
+ delete lock_;
}
}
@@ -121,6 +122,7 @@
int expected_count_;
std::string topic_;
+ boost::timed_mutex::scoped_lock* lock_;
boost::timed_mutex mutex_;
};
@@ -164,7 +166,7 @@
boost::timed_mutex::scoped_timed_lock lock(c.mutex_, xt);
- EXPECT_EQ(true, lock.locked());
+ EXPECT_EQ(true, lock.owns_lock());
}
std_msgs::PointStamped msg;
@@ -179,7 +181,7 @@
boost::timed_mutex::scoped_timed_lock lock(n.mutex_, xt);
- EXPECT_EQ(true, lock.locked());
+ EXPECT_EQ(true, lock.owns_lock());
}
EXPECT_EQ(1, n.count_);
@@ -209,7 +211,7 @@
boost::timed_mutex::scoped_timed_lock lock(c.mutex_, xt);
- EXPECT_EQ(true, lock.locked());
+ EXPECT_EQ(true, lock.owns_lock());
}
g_broadcaster->sendTransform(btTransform(btQuaternion(0,0,0), btVector3(1,2,3)), stamp, "frame3", "frame4");
@@ -221,7 +223,7 @@
boost::timed_mutex::scoped_timed_lock lock(n.mutex_, xt);
- EXPECT_EQ(true, lock.locked());
+ EXPECT_EQ(true, lock.owns_lock());
}
EXPECT_EQ(1, n.count_);
@@ -256,7 +258,7 @@
boost::timed_mutex::scoped_timed_lock lock(c.mutex_, xt);
- EXPECT_EQ(true, lock.locked());
+ EXPECT_EQ(true, lock.owns_lock());
}
ros::Duration(0.1).sleep();
@@ -270,7 +272,7 @@
boost::timed_mutex::scoped_timed_lock lock(n.mutex_, xt);
- EXPECT_EQ(true, lock.locked());
+ EXPECT_EQ(true, lock.owns_lock());
}
EXPECT_EQ(10, n.count_);
@@ -297,7 +299,7 @@
boost::timed_mutex::scoped_timed_lock lock(c.mutex_, xt);
- EXPECT_EQ(true, lock.locked());
+ EXPECT_EQ(true, lock.owns_lock());
}
std_msgs::PointStamped msg;
@@ -312,7 +314,7 @@
boost::timed_mutex::scoped_timed_lock lock(n.mutex_, xt);
- EXPECT_EQ(true, lock.locked());
+ EXPECT_EQ(true, lock.owns_lock());
}
EXPECT_EQ(1, n.count_);
@@ -339,7 +341,7 @@
boost::timed_mutex::scoped_timed_lock lock(c.mutex_, xt);
- EXPECT_EQ(true, lock.locked());
+ EXPECT_EQ(true, lock.owns_lock());
}
std_msgs::PointStamped msg;
@@ -354,7 +356,7 @@
boost::timed_mutex::scoped_timed_lock lock(n.mutex_, xt);
- EXPECT_EQ(true, lock.locked());
+ EXPECT_EQ(true, lock.owns_lock());
}
EXPECT_EQ(1, n.count_);
Modified: pkg/trunk/visualization/ogre_tools/manifest.xml
===================================================================
--- pkg/trunk/visualization/ogre_tools/manifest.xml 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/visualization/ogre_tools/manifest.xml 2008-11-26 02:31:51 UTC (rev 7325)
@@ -11,15 +11,13 @@
<depend package="wxswig"/>
<depend package="ogre"/>
<depend package="rosconsole"/>
+ <depend package="boost"/>
<export>
<cpp cflags="-I${prefix}/src/" lflags="-Wl,-rpath,${prefix}/lib ${prefix}/lib/_ogre_tools.so"/>
<python path="${prefix}/lib/"/>
</export>
<sysdepend os="ubuntu" version="7.04-feisty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
- <sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
- <sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
<sysdepend os="ubuntu" version="8.10-intrepid" package="libwxgtk2.8-dev"/>
</package>
Modified: pkg/trunk/visualization/ogre_visualizer/manifest.xml
===================================================================
--- pkg/trunk/visualization/ogre_visualizer/manifest.xml 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/visualization/ogre_visualizer/manifest.xml 2008-11-26 02:31:51 UTC (rev 7325)
@@ -16,6 +16,7 @@
<depend package="rosthread"/>
<depend package="tf"/>
<depend package="wg_robot_description"/>
+ <depend package="gazebo_robot_description"/>
<depend package="wg_robot_description_parser"/>
<depend package="scan_utils" />
<depend package="wxpropgrid"/>
@@ -25,6 +26,7 @@
<depend package="wxswig"/>
<depend package="wxPython_swig_interface"/>
<depend package="std_srvs"/>
+ <depend package="boost"/>
<export>
<cpp cflags="-I${prefix}/src/" lflags="-Wl,-rpath,${prefix}/lib ${prefix}/lib/_ogre_visualizer.so"/>
<python path="${prefix}/lib/"/>
@@ -32,10 +34,6 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
- <sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
- <sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="libboost-signals-dev"/>
<!-- Note that the presence of python-wxgtk2.6 will cause a
mysterious segfault -->
<sysdepend os="ubuntu" version="8.04-hardy" package="python-wxgtk2.8"/>
Modified: pkg/trunk/visualization/wx_rosout/CMakeLists.txt
===================================================================
--- pkg/trunk/visualization/wx_rosout/CMakeLists.txt 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/visualization/wx_rosout/CMakeLists.txt 2008-11-26 02:31:51 UTC (rev 7325)
@@ -12,10 +12,6 @@
include(${wxWidgets_USE_FILE})
include_directories(${wxWidgets_INCLUDE_DIRS})
-find_package(Boost 0 REQUIRED COMPONENTS regex)
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-
# Find the combined swig flags for this project
_rospack_invoke(${PROJECT_NAME} ${PROJECT_NAME} SWIG_FLAGS "--lang=swig" "--attrib=flags" "export")
set(SWIG_FLAGS ${${PROJECT_NAME}_SWIG_FLAGS})
@@ -41,7 +37,7 @@
src/wx_rosout/rosout_list_control.cpp
src/wx_rosout/rosout_setup_dialog.cpp
${SWIG_OUTPUT_CPP_FILE})
-target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} ${Boost_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} -lboost_regex)
# swig python needs a shared library named _<modulename>.[so|dll|...]
# this renames the output file to conform to that by prepending an underscore and removing the "lib" prefix
set_target_properties(${PROJECT_NAME}
Modified: pkg/trunk/visualization/wx_rosout/manifest.xml
===================================================================
--- pkg/trunk/visualization/wx_rosout/manifest.xml 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/visualization/wx_rosout/manifest.xml 2008-11-26 02:31:51 UTC (rev 7325)
@@ -13,16 +13,12 @@
<depend package="rosthread"/>
<depend package="wxswig"/>
<depend package="wxPython_swig_interface"/>
+ <depend package="boost"/>
<export>
<cpp cflags="-I${prefix}/src/" lflags="-Wl,-rpath,${prefix}/lib ${prefix}/lib/_wx_rosout.so"/>
<python path="${prefix}/lib/"/>
</export>
<sysdepend os="ubuntu" version="7.04-feisty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
-<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
-<sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
-<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-regex-dev"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-regex-dev"/>
</package>
Modified: pkg/trunk/visualization/wx_rosout/src/test/send_test.cpp
===================================================================
--- pkg/trunk/visualization/wx_rosout/src/test/send_test.cpp 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/visualization/wx_rosout/src/test/send_test.cpp 2008-11-26 02:31:51 UTC (rev 7325)
@@ -21,7 +21,7 @@
ROS_FATAL("Fatal%d", count);
ROS_INFO("Newline\nTest\nblah\nblah\nblah\nblah\nblah\n");
- usleep( 10000 );
+ //usleep( 10000 );
++count;
}
Modified: pkg/trunk/world_models/topological_map/manifest.xml
===================================================================
--- pkg/trunk/world_models/topological_map/manifest.xml 2008-11-26 02:31:01 UTC (rev 7324)
+++ pkg/trunk/world_models/topological_map/manifest.xml 2008-11-26 02:31:51 UTC (rev 7325)
@@ -7,9 +7,8 @@
<depend package="std_msgs" />
<depend package="std_srvs" />
<depend package="rosconsole" />
+<depend package="boost" />
<export>
<cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -ltf" />
</export>
-<sysdepend os="ubuntu" version="7.04-hardy" package="libboost-graph-dev"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-graph-dev"/>
</package>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
