From dad2fe54f758bea9a94cdac47c07c8df1c334aff Mon Sep 17 00:00:00 2001 From: Shaun Edwards Date: Sun, 5 Jan 2014 20:31:11 -0500 Subject: [PATCH 1/3] Added source install to simple message package --- simple_message/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/simple_message/CMakeLists.txt b/simple_message/CMakeLists.txt index 435e82e5..d3290d6b 100644 --- a/simple_message/CMakeLists.txt +++ b/simple_message/CMakeLists.txt @@ -134,3 +134,10 @@ install( install( DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) + +# The simple message library is a source library with only the most common +# libraries pre-built. For this reason, the source is installed in the shared +# directory. +install( + DIRECTORY src/ + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/src) From a13263170b6ebfc03c060280d76e95b5c9954713 Mon Sep 17 00:00:00 2001 From: Shaun Edwards Date: Sun, 5 Jan 2014 21:06:11 -0500 Subject: [PATCH 2/3] Cleaned up CMakeLists, reformated and fixed white space --- industrial_robot_client/CMakeLists.txt | 57 ++------------------ industrial_robot_simulator/CMakeLists.txt | 21 +------- industrial_trajectory_filters/CMakeLists.txt | 8 +-- industrial_utils/CMakeLists.txt | 51 +++--------------- simple_message/CMakeLists.txt | 24 ++------- 5 files changed, 16 insertions(+), 145 deletions(-) diff --git a/industrial_robot_client/CMakeLists.txt b/industrial_robot_client/CMakeLists.txt index 845421bb..d8a9613e 100644 --- a/industrial_robot_client/CMakeLists.txt +++ b/industrial_robot_client/CMakeLists.txt @@ -1,15 +1,13 @@ -# http://ros.org/doc/groovy/api/catkin/html/user_guide/supposed.html cmake_minimum_required(VERSION 2.8.3) + project(industrial_robot_client) -# Load catkin and all dependencies required for this package + find_package(catkin REQUIRED COMPONENTS roscpp std_msgs sensor_msgs control_msgs trajectory_msgs simple_message actionlib_msgs actionlib urdf industrial_msgs industrial_utils) -## System dependencies are found with CMake's conventions -# find_package(Boost REQUIRED COMPONENTS system) find_package(Boost REQUIRED COMPONENTS system thread) # The definition is copied from the CMakeList for the simple_message package. -add_definitions(-DROS=1) #build using ROS libraries +add_definitions(-DROS=1) #build using ROS libraries add_definitions(-DLINUXSOCKETS=1) #build using LINUX SOCKETS libraries set(SRC_FILES src/joint_relay_handler.cpp @@ -20,57 +18,13 @@ set(SRC_FILES src/joint_relay_handler.cpp src/robot_state_interface.cpp src/utils.cpp) -####################################### -## Declare ROS messages and services ## -####################################### - -## Generate messages in the 'msg' folder -# add_message_files( -# FILES -# Message1.msg -# Message2.msg -# ) - -## Generate services in the 'srv' folder -# add_service_files( -# FILES -# Service1.srv -# Service2.srv -# ) - -## Generate added messages and services with any dependencies listed here -# generate_messages( -# DEPENDENCIES -# std_msgs -# ) - -################################### -## catkin specific configuration ## -################################### -## The catkin_package macro generates cmake config files for your package -## Declare things to be passed to dependent projects -## LIBRARIES: libraries you create in this project that dependent projects also need -## CATKIN_DEPENDS: catkin_packages dependent projects also need -## DEPENDS: system dependencies of this project that dependent projects also need - -# NOTE: The libraries generated this package are not included in the catkin_package -# macro because libraries must be explicitly linked in projects that depend on this -# package. If this is not done (and these libraries were exported), then multiple -# library definitions (normal - industrial_robot_client and byteswapped - -# industrial_robot_client_bswap) are both included (this is bad). - catkin_package( CATKIN_DEPENDS roscpp std_msgs sensor_msgs control_msgs trajectory_msgs simple_message actionlib_msgs actionlib urdf industrial_msgs industrial_utils INCLUDE_DIRS include ) -########### -## Build ## -########### -## Specify additional locations of header files -## Your package locations should be listed before other locations include_directories(include ${catkin_INCLUDE_DIRS} ) @@ -88,14 +42,12 @@ include_directories(include # or # target_link_libraries(my_node industrial_robot_client_bswap) - add_library(industrial_robot_client ${SRC_FILES}) target_link_libraries(industrial_robot_client simple_message) add_library(industrial_robot_client_bswap ${SRC_FILES}) target_link_libraries(industrial_robot_client_bswap simple_message_bswap) - # The following executables(nodes) are for applications where the robot # controller and pc have the same byte order (i.e. byte swapping NOT # required) @@ -164,9 +116,6 @@ target_link_libraries(utest_robot_client ${catkin_LIBRARIES}) -############# -## Install ## -############# install( TARGETS industrial_robot_client industrial_robot_client_bswap LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) diff --git a/industrial_robot_simulator/CMakeLists.txt b/industrial_robot_simulator/CMakeLists.txt index 09279ae6..cee73804 100644 --- a/industrial_robot_simulator/CMakeLists.txt +++ b/industrial_robot_simulator/CMakeLists.txt @@ -1,30 +1,13 @@ -# http://ros.org/doc/groovy/api/catkin/html/user_guide/supposed.html cmake_minimum_required(VERSION 2.8.3) + project(industrial_robot_simulator) -# Load catkin and all dependencies required for this package -find_package(catkin REQUIRED COMPONENTS roscpp std_msgs sensor_msgs control_msgs trajectory_msgs industrial_robot_client) -# Python setup -#catkin_python_setup() +find_package(catkin REQUIRED COMPONENTS roscpp std_msgs sensor_msgs control_msgs trajectory_msgs industrial_robot_client) -################################### -## catkin specific configuration ## -################################### -## The catkin_package macro generates cmake config files for your package -## Declare things to be passed to dependent projects -## LIBRARIES: libraries you create in this project that dependent projects also need -## CATKIN_DEPENDS: catkin_packages dependent projects also need -## DEPENDS: system dependencies of this project that dependent projects also need catkin_package( CATKIN_DEPENDS roscpp std_msgs sensor_msgs control_msgs trajectory_msgs industrial_robot_client ) -############# -## Install ## -############# - -# all install targets should use catkin DESTINATION variables -# See http://ros.org/doc/groovy/api/catkin/html/adv_user_guide/variables.html install(PROGRAMS industrial_robot_simulator DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) diff --git a/industrial_trajectory_filters/CMakeLists.txt b/industrial_trajectory_filters/CMakeLists.txt index 7911f47d..02705f4e 100644 --- a/industrial_trajectory_filters/CMakeLists.txt +++ b/industrial_trajectory_filters/CMakeLists.txt @@ -1,5 +1,5 @@ -# http://ros.org/doc/groovy/api/catkin/html/user_guide/supposed.html cmake_minimum_required(VERSION 2.8.3) + project(industrial_trajectory_filters) find_package(catkin REQUIRED COMPONENTS moveit_ros_planning trajectory_msgs) @@ -14,17 +14,11 @@ include_directories(include ${catkin_INCLUDE_DIRS} ) -########### -## Build ## -########### add_library(${PROJECT_NAME} src/n_point_filter.cpp src/uniform_sample_filter.cpp) target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES}) -############# -## Install ## -############# install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) diff --git a/industrial_utils/CMakeLists.txt b/industrial_utils/CMakeLists.txt index 6c1ea237..cac163fe 100644 --- a/industrial_utils/CMakeLists.txt +++ b/industrial_utils/CMakeLists.txt @@ -1,69 +1,30 @@ -# http://ros.org/doc/groovy/api/catkin/html/user_guide/supposed.html cmake_minimum_required(VERSION 2.8.3) + project(industrial_utils) -# Load catkin and all dependencies required for this package + find_package(catkin REQUIRED COMPONENTS roscpp urdf) -## System dependencies are found with CMake's conventions -# find_package(Boost REQUIRED COMPONENTS system) find_package(Boost REQUIRED COMPONENTS system) -####################################### -## Declare ROS messages and services ## -####################################### - -## Generate messages in the 'msg' folder -# add_message_files( -# FILES -# Message1.msg -# Message2.msg -# ) - -## Generate services in the 'srv' folder -# add_service_files( -# FILES -# Service1.srv -# Service2.srv -# ) - -## Generate added messages and services with any dependencies listed here -# generate_messages( -# DEPENDENCIES -# std_msgs -# ) - -################################### -## catkin specific configuration ## -################################### -## The catkin_package macro generates cmake config files for your package -## Declare things to be passed to dependent projects -## LIBRARIES: libraries you create in this project that dependent projects also need -## CATKIN_DEPENDS: catkin_packages dependent projects also need -## DEPENDS: system dependencies of this project that dependent projects also need catkin_package( CATKIN_DEPENDS roscpp urdf INCLUDE_DIRS include LIBRARIES ${PROJECT_NAME} ) -########### -## Build ## -########### - -## Specify additional locations of header files -## Your package locations should be listed before other locations include_directories(include ${catkin_INCLUDE_DIRS}) add_library(${PROJECT_NAME} src/utils.cpp src/param_utils.cpp) target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES}) + + catkin_add_gtest(utest_inds_utils test/utest.cpp) target_link_libraries(utest_inds_utils ${PROJECT_NAME} ${catkin_LIBRARIES}) -############# -## Install ## -############# + + install( TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) diff --git a/simple_message/CMakeLists.txt b/simple_message/CMakeLists.txt index d3290d6b..1d50957f 100644 --- a/simple_message/CMakeLists.txt +++ b/simple_message/CMakeLists.txt @@ -1,7 +1,7 @@ -# http://ros.org/doc/groovy/api/catkin/html/user_guide/supposed.html cmake_minimum_required(VERSION 2.8.3) + project(simple_message) -# Load catkin and all dependencies required for this package + find_package(catkin REQUIRED COMPONENTS roscpp industrial_msgs) # Build static libs, to reduce dependency-chaining for industrial_robot_client @@ -12,7 +12,7 @@ set(ROS_BUILD_SHARED_LIBS false) # and various robot controllers. This requires conditionally compiling # certain functions and headers. The definition below enables compiling # for a ROS node. -add_definitions(-DROS=1) #build using ROS libraries +add_definitions(-DROS=1) #build using ROS libraries add_definitions(-DLINUXSOCKETS=1) #use linux sockets for communication set(SRC_FILES src/byte_array.cpp @@ -61,15 +61,6 @@ set(UTEST_SRC_FILES test/utest.cpp test/utest_message.cpp) # controllers). This library performs byte swapping at the lowest load/unload # levels. -################################### -## catkin specific configuration ## -################################### -## The catkin_package macro generates cmake config files for your package -## Declare things to be passed to dependent projects -## LIBRARIES: libraries you create in this project that dependent projects also need -## CATKIN_DEPENDS: catkin_packages dependent projects also need -## DEPENDS: system dependencies of this project that dependent projects also need - # NOTE: The libraries generated this package are not included in the catkin_package # macro because libraries must be explicitly linked in projects that depend on this # package. If this is not done (and these libraries were exported), then multiple @@ -81,12 +72,7 @@ catkin_package( INCLUDE_DIRS include ) -########### -## Build ## -########### -## Specify additional locations of header files -## Your package locations should be listed before other locations include_directories(include ${catkin_INCLUDE_DIRS} ) @@ -124,9 +110,7 @@ set_target_properties(utest_float64 PROPERTIES COMPILE_DEFINITIONS "TEST_PORT_BA target_link_libraries(utest_float64 simple_message_float64) -############# -## Install ## -############# + install( TARGETS simple_message simple_message_bswap simple_message_float64 LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) From c02a2087bf4c79b9b801c4dd497fb0cd91624aa8 Mon Sep 17 00:00:00 2001 From: Shaun Edwards Date: Mon, 6 Jan 2014 18:30:38 -0500 Subject: [PATCH 3/3] Removed source install from simple message --- simple_message/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/simple_message/CMakeLists.txt b/simple_message/CMakeLists.txt index 1d50957f..2efdbf5b 100644 --- a/simple_message/CMakeLists.txt +++ b/simple_message/CMakeLists.txt @@ -119,9 +119,3 @@ install( DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) -# The simple message library is a source library with only the most common -# libraries pre-built. For this reason, the source is installed in the shared -# directory. -install( - DIRECTORY src/ - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/src)