Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[7212] pkg/trunk
|
From: <rob...@us...> - 2008-11-24 18:09:47
|
Revision: 7212
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=7212&view=rev
Author: rob_wheeler
Date: 2008-11-24 18:09:44 +0000 (Mon, 24 Nov 2008)
Log Message:
-----------
Build realtime libraries statically so that Xenomai's posix wrappers can be
applied.
Modified Paths:
--------------
pkg/trunk/controllers/pr2_mechanism_controllers/CMakeLists.txt
pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml
pkg/trunk/controllers/qualification_controllers/gripper_qualification_controllers/CMakeLists.txt
pkg/trunk/controllers/qualification_controllers/gripper_qualification_controllers/manifest.xml
pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/CMakeLists.txt
pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml
pkg/trunk/controllers/qualification_controllers/motor_qualification_controllers/CMakeLists.txt
pkg/trunk/controllers/qualification_controllers/motor_qualification_controllers/manifest.xml
pkg/trunk/controllers/robot_mechanism_controllers/CMakeLists.txt
pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml
pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml
pkg/trunk/mechanism/mechanism_control/CMakeLists.txt
pkg/trunk/mechanism/mechanism_control/manifest.xml
pkg/trunk/robot_control_loops/pr2_etherCAT/manifest.xml
Removed Paths:
-------------
pkg/trunk/mechanism/mechanism_control_rt/
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/CMakeLists.txt
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/CMakeLists.txt 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/CMakeLists.txt 2008-11-24 18:09:44 UTC (rev 7212)
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 2.6)
include(rosbuild)
+set(ROS_BUILD_STATIC_LIBS true)
+set(ROS_BUILD_SHARED_LIBS false)
rospack(pr2_mechanism_controllers)
genmsg()
gensrv()
@@ -21,14 +23,14 @@
src/gripper_calibration_controller.cpp
)
-rospack_add_executable(testBaseController test/test_base_controller.cpp)
-target_link_libraries(testBaseController pr2_mechanism_controllers)
+#rospack_add_executable(testBaseController test/test_base_controller.cpp)
+#target_link_libraries(testBaseController pr2_mechanism_controllers)
-rospack_add_executable(testRunBaseController test/test_run_base_controller.cpp)
-target_link_libraries(testRunBaseController pr2_mechanism_controllers)
+#rospack_add_executable(testRunBaseController test/test_run_base_controller.cpp)
+#target_link_libraries(testRunBaseController pr2_mechanism_controllers)
-rospack_add_executable(testArmDynamicsController test/test_arm_dynamics_controller.cpp)
-target_link_libraries(testRunBaseController pr2_mechanism_controllers)
+#rospack_add_executable(testArmDynamicsController test/test_arm_dynamics_controller.cpp)
+#target_link_libraries(testRunBaseController pr2_mechanism_controllers)
-rospack_add_executable(testOdom test/test_odom.cpp)
-target_link_libraries(testOdom pr2_mechanism_controllers)
+#rospack_add_executable(testOdom test/test_odom.cpp)
+#target_link_libraries(testOdom pr2_mechanism_controllers)
Modified: pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/controllers/pr2_mechanism_controllers/manifest.xml 2008-11-24 18:09:44 UTC (rev 7212)
@@ -26,7 +26,7 @@
<repository>http://pr.willowgarage.com/repos</repository>
<export>
<cpp cflags='-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp'
- lflags='-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lpr2_mechanism_controllers'/>
+ lflags='${prefix}/lib/libpr2_mechanism_controllers.a'/>
</export>
</package>
Modified: pkg/trunk/controllers/qualification_controllers/gripper_qualification_controllers/CMakeLists.txt
===================================================================
--- pkg/trunk/controllers/qualification_controllers/gripper_qualification_controllers/CMakeLists.txt 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/controllers/qualification_controllers/gripper_qualification_controllers/CMakeLists.txt 2008-11-24 18:09:44 UTC (rev 7212)
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 2.6)
include(rosbuild)
+set(ROS_BUILD_STATIC_LIBS true)
+set(ROS_BUILD_SHARED_LIBS false)
rospack(gripper_qualification_controllers)
genmsg()
gensrv()
Modified: pkg/trunk/controllers/qualification_controllers/gripper_qualification_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/qualification_controllers/gripper_qualification_controllers/manifest.xml 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/controllers/qualification_controllers/gripper_qualification_controllers/manifest.xml 2008-11-24 18:09:44 UTC (rev 7212)
@@ -15,7 +15,7 @@
<url>http://pr.willowgarage.com</url>
<repository>http://pr.willowgarage.com/repos</repository>
<export>
- <cpp cflags='-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp' lflags='-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lgripper_qualification_controllers'/>
+ <cpp cflags='-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp' lflags='${prefix}/lib/libgripper_qualification_controllers.a'/>
</export>
</package>
Modified: pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/CMakeLists.txt
===================================================================
--- pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/CMakeLists.txt 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/CMakeLists.txt 2008-11-24 18:09:44 UTC (rev 7212)
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 2.6)
include(rosbuild)
+set(ROS_BUILD_STATIC_LIBS true)
+set(ROS_BUILD_SHARED_LIBS false)
rospack(joint_qualification_controllers)
genmsg()
gensrv()
Modified: pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml 2008-11-24 18:09:44 UTC (rev 7212)
@@ -23,7 +23,7 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
<repository>http://pr.willowgarage.com/repos</repository>
<export>
- <cpp cflags='-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp' lflags='-Wl,-rpath,${prefix}/lib -L${prefix}/lib -ljoint_qualification_controllers'/>
+ <cpp cflags='-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp' lflags='${prefix}/lib/libjoint_qualification_controllers.a'/>
</export>
</package>
Modified: pkg/trunk/controllers/qualification_controllers/motor_qualification_controllers/CMakeLists.txt
===================================================================
--- pkg/trunk/controllers/qualification_controllers/motor_qualification_controllers/CMakeLists.txt 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/controllers/qualification_controllers/motor_qualification_controllers/CMakeLists.txt 2008-11-24 18:09:44 UTC (rev 7212)
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 2.6)
include(rosbuild)
+set(ROS_BUILD_STATIC_LIBS true)
+set(ROS_BUILD_SHARED_LIBS false)
rospack(motor_qualification_controllers)
genmsg()
gensrv()
Modified: pkg/trunk/controllers/qualification_controllers/motor_qualification_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/qualification_controllers/motor_qualification_controllers/manifest.xml 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/controllers/qualification_controllers/motor_qualification_controllers/manifest.xml 2008-11-24 18:09:44 UTC (rev 7212)
@@ -12,11 +12,10 @@
<depend package="misc_utils" />
<depend package="robot_msgs" />
<depend package="robot_mechanism_controllers" />
- <depend package="xenomai" />
<url>http://pr.willowgarage.com</url>
<repository>http://pr.willowgarage.com/repos</repository>
<export>
- <cpp cflags='-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp' lflags='-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lmotor_qualification_controllers'/>
+ <cpp cflags='-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp' lflags='${prefix}/lib/libmotor_qualification_controllers.a'/>
</export>
</package>
Modified: pkg/trunk/controllers/robot_mechanism_controllers/CMakeLists.txt
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/CMakeLists.txt 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/controllers/robot_mechanism_controllers/CMakeLists.txt 2008-11-24 18:09:44 UTC (rev 7212)
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 2.6)
include(rosbuild)
+set(ROS_BUILD_STATIC_LIBS true)
+set(ROS_BUILD_SHARED_LIBS false)
rospack(robot_mechanism_controllers)
genmsg()
gensrv()
Modified: pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml 2008-11-24 18:09:44 UTC (rev 7212)
@@ -21,7 +21,7 @@
<repository>http://pr.willowgarage.com/repos</repository>
<export>
<cpp cflags="-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp"
- lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lrobot_mechanism_controllers" />
+ lflags="${prefix}/lib/librobot_mechanism_controllers.a" />
</export>
</package>
Modified: pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml
===================================================================
--- pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml 2008-11-24 18:09:44 UTC (rev 7212)
@@ -13,6 +13,7 @@
<depend package='loki' />
<depend package='misc_utils' />
<depend package='robot_msgs' />
+<depend package='xenomai' />
<export>
<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lethercat_hardware -Wl,-rpath,${prefix}/lib"/>
</export>
Modified: pkg/trunk/mechanism/mechanism_control/CMakeLists.txt
===================================================================
--- pkg/trunk/mechanism/mechanism_control/CMakeLists.txt 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/mechanism/mechanism_control/CMakeLists.txt 2008-11-24 18:09:44 UTC (rev 7212)
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 2.6)
include(rosbuild)
+set(ROS_BUILD_STATIC_LIBS true)
+set(ROS_BUILD_SHARED_LIBS false)
rospack(mechanism_control)
rospack_add_library(mechanism_control src/mechanism_control.cpp)
#rospack_add_executable(ms_publisher_test test/ms_publisher_test.cpp)
Modified: pkg/trunk/mechanism/mechanism_control/manifest.xml
===================================================================
--- pkg/trunk/mechanism/mechanism_control/manifest.xml 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/mechanism/mechanism_control/manifest.xml 2008-11-24 18:09:44 UTC (rev 7212)
@@ -17,7 +17,7 @@
<depend package="robot_srvs" />
<export>
<cpp cflags='-I${prefix}/include'
- lflags='-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lmechanism_control'/>
+ lflags='${prefix}/lib/libmechanism_control.a'/>
</export>
</package>
Modified: pkg/trunk/robot_control_loops/pr2_etherCAT/manifest.xml
===================================================================
--- pkg/trunk/robot_control_loops/pr2_etherCAT/manifest.xml 2008-11-24 17:36:58 UTC (rev 7211)
+++ pkg/trunk/robot_control_loops/pr2_etherCAT/manifest.xml 2008-11-24 18:09:44 UTC (rev 7212)
@@ -5,7 +5,7 @@
<author>Rob Wheeler/wh...@wi...</author>
<license>BSD</license>
<review status="unreviewed" notes=""/>
- <depend package="mechanism_control_rt"/>
+ <depend package="mechanism_control"/>
<depend package="roscpp" />
<depend package="ethercat_hardware"/>
<depend package="hardware_interface"/>
@@ -14,6 +14,7 @@
<depend package="pr2_mechanism_controllers"/>
<depend package="gripper_qualification_controllers"/>
<depend package="joint_qualification_controllers"/>
+ <depend package="xenomai"/>
<url>http://pr.willowgarage.com</url>
<repository>http://pr.willowgarage.com/repos</repository>
</package>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
