Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots: [1515] pkg/trunk
|
From: <ge...@us...> - 2008-07-12 01:32:11
|
Revision: 1515
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=1515&view=rev
Author: gerkey
Date: 2008-07-11 18:32:20 -0700 (Fri, 11 Jul 2008)
Log Message:
-----------
Updated CMake files to respect the fact that they don't inherit their own exported build flags.
Modified Paths:
--------------
pkg/trunk/drivers/robot/pr2/libpr2API/CMakeLists.txt
pkg/trunk/drivers/robot/pr2/libpr2HW/CMakeLists.txt
pkg/trunk/nav/wavefront_player/CMakeLists.txt
pkg/trunk/simulators/rosgazebo/CMakeLists.txt
pkg/trunk/util/transforms/libTF/CMakeLists.txt
pkg/trunk/util/transforms/rosTF/CMakeLists.txt
pkg/trunk/util/wg_collision_space/CMakeLists.txt
pkg/trunk/util/wg_robot_desc/CMakeLists.txt
pkg/trunk/util/wg_robot_models/CMakeLists.txt
Modified: pkg/trunk/drivers/robot/pr2/libpr2API/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/robot/pr2/libpr2API/CMakeLists.txt 2008-07-12 01:07:47 UTC (rev 1514)
+++ pkg/trunk/drivers/robot/pr2/libpr2API/CMakeLists.txt 2008-07-12 01:32:20 UTC (rev 1515)
@@ -5,10 +5,14 @@
#set(ROS_BUILD_STATIC_EXES true)
rospack_add_library(pr2API src/pr2API.cpp)
rospack_add_executable(test_libpr2API src/test/test_pr2API.cpp)
+target_link_libraries(test_libpr2API pr2API)
rospack_add_executable(torque_test src/test/torque_test.cpp)
+target_link_libraries(torque_test pr2API)
rospack_add_executable(pick_object src/test/pick_object.cpp)
+target_link_libraries(pick_object pr2API)
rospack_add_executable(test_kin_controllers src/test/test_kin_controllers.cpp src/kinematic_controllers.cpp)
+target_link_libraries(test_kin_controllers pr2API)
rospack_add_executable(pr2_kin_kdl src/test/pr2_kin_kdl.cpp)
+target_link_libraries(pr2_kin_kdl pr2API)
rospack_add_executable(test_FK src/test/test_FK.cpp)
-
-
+target_link_libraries(test_FK pr2API)
Modified: pkg/trunk/drivers/robot/pr2/libpr2HW/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/robot/pr2/libpr2HW/CMakeLists.txt 2008-07-12 01:07:47 UTC (rev 1514)
+++ pkg/trunk/drivers/robot/pr2/libpr2HW/CMakeLists.txt 2008-07-12 01:32:20 UTC (rev 1515)
@@ -5,3 +5,4 @@
#set(ROS_BUILD_STATIC_EXES true)
rospack_add_library(pr2HW src/pr2HW.cpp)
rospack_add_executable(test_pr2HW src/test/test_pr2HW.cpp)
+target_link_libraries(test_pr2HW pr2HW)
Modified: pkg/trunk/nav/wavefront_player/CMakeLists.txt
===================================================================
--- pkg/trunk/nav/wavefront_player/CMakeLists.txt 2008-07-12 01:07:47 UTC (rev 1514)
+++ pkg/trunk/nav/wavefront_player/CMakeLists.txt 2008-07-12 01:32:20 UTC (rev 1515)
@@ -9,3 +9,4 @@
rospack_add_executable(send_goal send_goal.cc)
rospack_add_executable(query_wavefront query_wavefront.cpp)
+include_directories(srv/cpp)
Modified: pkg/trunk/simulators/rosgazebo/CMakeLists.txt
===================================================================
--- pkg/trunk/simulators/rosgazebo/CMakeLists.txt 2008-07-12 01:07:47 UTC (rev 1514)
+++ pkg/trunk/simulators/rosgazebo/CMakeLists.txt 2008-07-12 01:32:20 UTC (rev 1515)
@@ -4,4 +4,6 @@
add_definitions(-Wall)
rospack_add_library(RosGazeboNode src/RosGazeboNode.cpp)
rospack_add_executable(rosgazebo src/rosgazebo.cc)
+target_link_libraries(rosgazebo RosGazeboNode)
rospack_add_executable(rosgazebowriter src/rosgazebowriter.cc)
+target_link_libraries(rosgazebowriter RosGazeboNode)
Modified: pkg/trunk/util/transforms/libTF/CMakeLists.txt
===================================================================
--- pkg/trunk/util/transforms/libTF/CMakeLists.txt 2008-07-12 01:07:47 UTC (rev 1514)
+++ pkg/trunk/util/transforms/libTF/CMakeLists.txt 2008-07-12 01:32:20 UTC (rev 1515)
@@ -4,6 +4,10 @@
add_definitions(-Wall)
rospack_add_library(TF src/libTF.cpp src/Pose3DCache.cpp src/Pose3D.cpp)
rospack_add_executable(test src/test/main.cpp)
+target_link_libraries(test TF)
rospack_add_executable(testtf src/test/testtf.cc)
+target_link_libraries(testtf TF)
rospack_add_executable(test_interp src/test/test_interp.cc)
+target_link_libraries(test_interp TF)
rospack_add_executable(testMatrix src/test/testMatrix.cc)
+target_link_libraries(testMatrix TF)
Modified: pkg/trunk/util/transforms/rosTF/CMakeLists.txt
===================================================================
--- pkg/trunk/util/transforms/rosTF/CMakeLists.txt 2008-07-12 01:07:47 UTC (rev 1514)
+++ pkg/trunk/util/transforms/rosTF/CMakeLists.txt 2008-07-12 01:32:20 UTC (rev 1515)
@@ -4,4 +4,6 @@
add_definitions(-Wall)
rospack_add_library(rosTF src/rosTF.cpp)
rospack_add_executable(testServer src/testServer.cc)
+target_link_libraries(testServer rosTF)
rospack_add_executable(testClient src/testClient.cc)
+target_link_libraries(testClient rosTF)
Modified: pkg/trunk/util/wg_collision_space/CMakeLists.txt
===================================================================
--- pkg/trunk/util/wg_collision_space/CMakeLists.txt 2008-07-12 01:07:47 UTC (rev 1514)
+++ pkg/trunk/util/wg_collision_space/CMakeLists.txt 2008-07-12 01:32:20 UTC (rev 1515)
@@ -1,10 +1,9 @@
cmake_minimum_required(VERSION 2.6)
include(rosbuild)
rospack(wg_collision_space)
-include_directories(${wg_collision_space_INCLUDE_DIRS})
rospack_add_library(CollisionSpace src/collisionspace/kinematicODE.cpp
src/collisionspace/kinematicSOLID.cpp
src/collisionspace/environmentODE.cpp
src/collisionspace/environmentSOLID.cpp)
-link_directories(${wg_collision_space_LIBRARY_DIRS})
rospack_add_executable(test_kinematic_ode src/test/test_kinematic_ode.cpp)
+target_link_libraries(test_kinematic_ode CollisionSpace)
Modified: pkg/trunk/util/wg_robot_desc/CMakeLists.txt
===================================================================
--- pkg/trunk/util/wg_robot_desc/CMakeLists.txt 2008-07-12 01:07:47 UTC (rev 1514)
+++ pkg/trunk/util/wg_robot_desc/CMakeLists.txt 2008-07-12 01:32:20 UTC (rev 1515)
@@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 2.6)
include(rosbuild)
rospack(wg_robot_desc)
-include_directories(${wg_robot_desc_INCLUDE_DIRS})
rospack_add_library(URDF src/urdf/URDF.cpp src/urdf/MathExpression.cpp)
-link_directories(${wg_robot_desc_LIBRARY_DIRS})
rospack_add_executable(parse src/test/parse.cpp)
+target_link_libraries(parse URDF)
Modified: pkg/trunk/util/wg_robot_models/CMakeLists.txt
===================================================================
--- pkg/trunk/util/wg_robot_models/CMakeLists.txt 2008-07-12 01:07:47 UTC (rev 1514)
+++ pkg/trunk/util/wg_robot_models/CMakeLists.txt 2008-07-12 01:32:20 UTC (rev 1515)
@@ -1,5 +1,4 @@
cmake_minimum_required(VERSION 2.6)
include(rosbuild)
rospack(wg_robot_models)
-include_directories(${wg_robot_models_INCLUDE_DIRS})
rospack_add_library(RobotModels src/robotmodels/kinematic.cpp)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
