From 9eed0abfa00abc5a28ed1aeeb1d4c18465c4fa08 Mon Sep 17 00:00:00 2001 From: wheeler Date: Tue, 1 Dec 2009 01:23:38 +0000 Subject: [PATCH] Remove use of deprecated rosbuild macros --- ivcon/CMakeLists.txt | 4 ++-- kdl_parser/CMakeLists.txt | 4 ++-- resource_retriever/test/CMakeLists.txt | 2 +- robot_state_publisher/CMakeLists.txt | 4 ++-- urdf/CMakeLists.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ivcon/CMakeLists.txt b/ivcon/CMakeLists.txt index 8169c5a..fa1a311 100644 --- a/ivcon/CMakeLists.txt +++ b/ivcon/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 2.4.6) include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake) -rospack(ivcon) +rosbuild_init() #uncomment for profiling set(ROS_LINK_FLAGS "-lm" ${ROS_LINK_FLAGS}) -rospack_add_executable(bin/ivcon src/ivcon.c) +rosbuild_add_executable(bin/ivcon src/ivcon.c) diff --git a/kdl_parser/CMakeLists.txt b/kdl_parser/CMakeLists.txt index 1f81968..6625169 100644 --- a/kdl_parser/CMakeLists.txt +++ b/kdl_parser/CMakeLists.txt @@ -19,9 +19,9 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) #uncomment if you have defined messages -#genmsg() +#rosbuild_genmsg() #uncomment if you have defined services -#gensrv() +#rosbuild_gensrv() rosbuild_add_library(${PROJECT_NAME} src/kdl_parser.cpp) diff --git a/resource_retriever/test/CMakeLists.txt b/resource_retriever/test/CMakeLists.txt index 7624c4c..f1c0fa6 100644 --- a/resource_retriever/test/CMakeLists.txt +++ b/resource_retriever/test/CMakeLists.txt @@ -1,4 +1,4 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}) -rospack_add_gtest(test/utest test.cpp) +rosbuild_add_gtest(test/utest test.cpp) target_link_libraries(test/utest ${PROJECT_NAME}) diff --git a/robot_state_publisher/CMakeLists.txt b/robot_state_publisher/CMakeLists.txt index 9f9e7f5..56f67f7 100644 --- a/robot_state_publisher/CMakeLists.txt +++ b/robot_state_publisher/CMakeLists.txt @@ -18,9 +18,9 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) #uncomment if you have defined messages -#genmsg() +#rosbuild_genmsg() #uncomment if you have defined services -#gensrv() +#rosbuild_gensrv() rosbuild_add_library(${PROJECT_NAME} src/joint_state_listener.cpp src/robot_state_publisher.cpp src/treefksolverposfull_recursive.cpp) diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt index 232de10..4dceb93 100644 --- a/urdf/CMakeLists.txt +++ b/urdf/CMakeLists.txt @@ -17,7 +17,7 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) #uncomment if you have defined messages -#genmsg() +#rosbuild_genmsg() rosbuild_gensrv()