From b28e75858f86b450711b8fdcee74c8ccbc72b9f6 Mon Sep 17 00:00:00 2001 From: Walter Fetter Lages Date: Fri, 10 May 2019 04:56:32 -0300 Subject: [PATCH] Port to melodic. --- CMakeLists.txt | 34 +++++++++++++++++----------------- package.xml | 53 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 53 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc6271e..bc12257 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,24 +2,24 @@ cmake_minimum_required(VERSION 2.8.3) project(linearizing_controllers) ## Compile as C++11, supported in ROS Kinetic and newer -# add_compile_options(-std=c++11) +add_compile_options(-std=c++11) ## Find catkin macros and libraries ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## is used, also find other catkin packages find_package(catkin REQUIRED COMPONENTS + arc_odometry controller_interface effort_controllers - roscpp geometry_msgs + linearizing_controllers_msgs + roscpp tf - arc_odometry ) -find_package(cmake_modules REQUIRED) ## System dependencies are found with CMake's conventions # find_package(Boost REQUIRED COMPONENTS system) -find_package(Eigen REQUIRED) +find_package(Eigen3 REQUIRED) ## Uncomment this if the package has a setup.py. This macro ensures @@ -37,10 +37,10 @@ find_package(Eigen REQUIRED) ## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...). ## * In the file package.xml: ## * add a build_depend tag for "message_generation" -## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET +## * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET ## * If MSG_DEP_SET isn't empty the following dependency has been pulled in ## but can be declared for certainty nonetheless: -## * add a run_depend tag for "message_runtime" +## * add a exec_depend tag for "message_runtime" ## * In this file (CMakeLists.txt): ## * add "message_generation" and every package in MSG_DEP_SET to ## find_package(catkin REQUIRED COMPONENTS ...) @@ -75,7 +75,7 @@ find_package(Eigen REQUIRED) ## Generate added messages and services with any dependencies listed here # generate_messages( # DEPENDENCIES -# std_msgs # Or other packages containing msgs +# geometry_msgs# linearizing_controllers_msgs # ) ################################################ @@ -85,7 +85,7 @@ find_package(Eigen REQUIRED) ## To declare and build dynamic reconfigure parameters within this ## package, follow these steps: ## * In the file package.xml: -## * add a build_depend and a run_depend tag for "dynamic_reconfigure" +## * add a build_depend and a exec_depend tag for "dynamic_reconfigure" ## * In this file (CMakeLists.txt): ## * add "dynamic_reconfigure" to ## find_package(catkin REQUIRED COMPONENTS ...) @@ -103,15 +103,15 @@ find_package(Eigen REQUIRED) ################################### ## The catkin_package macro generates cmake config files for your package ## Declare things to be passed to dependent projects -## INCLUDE_DIRS: uncomment this if you package contains header files +## INCLUDE_DIRS: uncomment this if your package contains header files ## 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( INCLUDE_DIRS include LIBRARIES linearizing_controllers - CATKIN_DEPENDS controller_interface effort_controllers geometry_msgs roscpp tf arc_odometry - DEPENDS Eigen + CATKIN_DEPENDS arc_odometry controller_interface effort_controllers geometry_msgs linearizing_controllers_msgs roscpp tf + DEPENDS EIGEN3 ) ########### @@ -121,10 +121,10 @@ catkin_package( ## Specify additional locations of header files ## Your package locations should be listed before other locations include_directories( - include + include ${catkin_INCLUDE_DIRS} -# TODO: Check names of system library include directories (Eigen) - ${Eigen_INCLUDE_DIRS} +# TODO: Check names of system library include directories (Eigen3) + ${EIGEN3_INCLUDE_DIRS} ) ## Declare a C++ library @@ -156,7 +156,7 @@ add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EX ## Specify libraries to link a library or executable target against target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} - ${Eigen_LIBRARIES} +# ${Eigen3_LIBRARIES} ) ############# @@ -174,7 +174,7 @@ target_link_libraries(${PROJECT_NAME} # ) ## Mark executables and/or libraries for installation -install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME} +install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} diff --git a/package.xml b/package.xml index c742c04..5ed34fb 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ - + linearizing_controllers - 0.0.0 + 0.0.1 The linearizing_controllers package @@ -29,39 +29,58 @@ Walter Fetter Lages - + + + + + + + + - - + + + + catkin - Eigen + Eigen3 + arc_odometry controller_interface effort_controllers geometry_msgs - tf - arc_odometry linearizing_controllers_msgs roscpp - Eigen - controller_interface - effort_controllers - geometry_msgs - tf - arc_odometry - linearizing_controllers_msgs - roscpp + tf + Eigen3 + arc_odometry + controller_interface + effort_controllers + geometry_msgs + linearizing_controllers_msgs + roscpp + tf + Eigen3 + arc_odometry + controller_interface + effort_controllers + geometry_msgs + linearizing_controllers_msgs + roscpp + tf - + + + -- 2.12.0