Obbart/universal_robots_ros_driver
1
0
Fork 0
mirror of https://gitlab.com/obbart/universal_robots_ros_driver.git synced 2026-04-10 10:00:48 +02:00
Code Releases Activity

Merge pull request #3 from TAMS-Group/pr-kinetic-catkin-lint

Browse Source 
Satisfy catkin_lint
This commit is contained in:
Simon Rasmussen
2017-10-12 21:56:17 +02:00
committed by GitHub
parent 372aca967f 0257396486
commit ef7aca7fb9
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 2.8.12)
project(ur_modern_driver) project(ur_modern_driver)
@@ -16,7 +16,7 @@ find_package(catkin REQUIRED COMPONENTS
geometry_msgs geometry_msgs
roscpp roscpp
sensor_msgs sensor_msgs
std_msgs std_srvs
trajectory_msgs trajectory_msgs
ur_msgs ur_msgs
tf tf
@@ -113,9 +113,8 @@ find_package(catkin REQUIRED COMPONENTS
## DEPENDS: system dependencies of this project that dependent projects also need ## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
# LIBRARIES ur_modern_driver LIBRARIES ur_hardware_interface
CATKIN_DEPENDS hardware_interface controller_manager actionlib control_msgs geometry_msgs roscpp sensor_msgs trajectory_msgs ur_msgs CATKIN_DEPENDS hardware_interface controller_manager actionlib control_msgs geometry_msgs roscpp sensor_msgs trajectory_msgs ur_msgs
DEPENDS ur_hardware_interface
) )
########### ###########
@@ -127,14 +126,16 @@ include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if(COMPILER_SUPPORTS_CXX11) if(COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "-std=c++11") add_compile_options(-std=c++11)
elseif(COMPILER_SUPPORTS_CXX0X) elseif(COMPILER_SUPPORTS_CXX0X)
set(CMAKE_CXX_FLAGS "-std=c++0x") add_compile_options(-std=c++0x)
else() else()
message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler. Suggested solution: update the pkg build-essential ") message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler. Suggested solution: update the pkg build-essential ")
endif() endif()
set(CMAKE_CXX_FLAGS "-g -Wall -Wextra -Wno-unused-parameter ${CMAKE_CXX_FLAGS}") add_compile_options(-Wall)
add_compile_options(-Wextra)
add_compile_options(-Wno-unused-parameter)
## Specify additional locations of header files ## Specify additional locations of header files
## Your package locations should be listed before other locations ## Your package locations should be listed before other locations

5
package.xml
View File

@@ -47,11 +47,9 @@
<build_depend>geometry_msgs</build_depend> <build_depend>geometry_msgs</build_depend>
<build_depend>roscpp</build_depend> <build_depend>roscpp</build_depend>
<build_depend>sensor_msgs</build_depend> <build_depend>sensor_msgs</build_depend>
<build_depend>std_msgs</build_depend>
<build_depend>trajectory_msgs</build_depend> <build_depend>trajectory_msgs</build_depend>
<build_depend>ur_msgs</build_depend> <build_depend>ur_msgs</build_depend>
<build_depend>tf</build_depend> <build_depend>tf</build_depend>
<build_depend>realtime_tools</build_depend>
<build_depend>std_srvs</build_depend> <build_depend>std_srvs</build_depend>
<run_depend>hardware_interface</run_depend> <run_depend>hardware_interface</run_depend>
<run_depend>controller_manager</run_depend> <run_depend>controller_manager</run_depend>
@@ -61,14 +59,13 @@
<run_depend>geometry_msgs</run_depend> <run_depend>geometry_msgs</run_depend>
<run_depend>roscpp</run_depend> <run_depend>roscpp</run_depend>
<run_depend>sensor_msgs</run_depend> <run_depend>sensor_msgs</run_depend>
<run_depend>std_msgs</run_depend>
<run_depend>trajectory_msgs</run_depend> <run_depend>trajectory_msgs</run_depend>
<run_depend>ur_msgs</run_depend> <run_depend>ur_msgs</run_depend>
<run_depend>ur_description</run_depend> <run_depend>ur_description</run_depend>
<run_depend>tf</run_depend> <run_depend>tf</run_depend>
<run_depend>realtime_tools</run_depend>
<run_depend>std_srvs</run_depend> <run_depend>std_srvs</run_depend>
<test_depend>rosunit</test_depend>
<!-- The export tag contains other, unspecified, tags --> <!-- The export tag contains other, unspecified, tags -->
<export> <export>