From: Walter Fetter Lages Date: Sat, 5 Dec 2020 05:18:35 +0000 (-0300) Subject: Port to Noetic. X-Git-Url: http://git.ece.ufrgs.br/?a=commitdiff_plain;h=786df8b8a4c7cc7112b318766a921964a5b15f1b;p=bno055_driver.git Port to Noetic. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 38cc8f4..f06218e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.0.2) project(bno055_driver) ## Compile as C++11, supported in ROS Kinetic and newer @@ -8,15 +8,15 @@ add_compile_options(-std=c++11) ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## is used, also find other catkin packages find_package(catkin REQUIRED COMPONENTS - roscpp +# bno055 eigen_conversions geometry_msgs + roscpp sensor_msgs ) ## System dependencies are found with CMake's conventions # find_package(Boost REQUIRED COMPONENTS system) -#find_package(bno055 REQUIRED) find_package(Eigen3 REQUIRED) add_library(bno055 STATIC IMPORTED) # or STATIC instead of SHARED @@ -84,9 +84,7 @@ set_target_properties(bno055ifc PROPERTIES ## Generate added messages and services with any dependencies listed here # generate_messages( # DEPENDENCIES -# geometry_msgs -# sensor_msgs -# eigen_conversions +# geometry_msgs# sensor_msgs # ) ################################################ @@ -121,8 +119,8 @@ set_target_properties(bno055ifc PROPERTIES catkin_package( # INCLUDE_DIRS include # LIBRARIES bno055_driver -# CATKIN_DEPENDS roscpp geometry_msgs sensor_msgs eigen_conversions -# DEPENDS bno055 Eigen3 +# CATKIN_DEPENDS bno055 eigen_conversions geometry_msgs roscpp sensor_msgs +# DEPENDS Eigen3 ) ########### @@ -134,8 +132,7 @@ catkin_package( include_directories( # include ${catkin_INCLUDE_DIRS} -# TODO: Check names of system library include directories (bno055, Eigen3) -# ${bno055_INCLUDE_DIRS} +# TODO: Check names of system library include directories (Eigen3) ${EIGEN3_INCLUDE_DIRS} ) @@ -167,7 +164,7 @@ add_executable(bno055_node src/bno055_node.cpp) ## Specify libraries to link a library or executable target against target_link_libraries(bno055_node ${catkin_LIBRARIES} -# ${bno055_LIBRARIES} +# ${Eigen3_LIBRARIES} bno055ifc bno055 ) @@ -181,16 +178,23 @@ target_link_libraries(bno055_node ## Mark executable scripts (Python etc.) for installation ## in contrast to setup.py, you can choose the destination -# install(PROGRAMS +# catkin_install_python(PROGRAMS # scripts/my_python_script # DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} # ) -## Mark executables and/or libraries for installation -# install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_node +## Mark executables for installation +## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html +# install(TARGETS ${PROJECT_NAME}_node +# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +# ) + +## Mark libraries for installation +## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html +# install(TARGETS ${PROJECT_NAME} # ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} # LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +# RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} # ) ## Mark cpp header files for installation diff --git a/package.xml b/package.xml index 1c1135a..33a514d 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ bno055_driver - 0.0.0 + 0.1.0 The bno055_driver package @@ -26,7 +26,7 @@ - Walter Fetter Lages + Walter Feter Lages @@ -50,21 +50,24 @@ catkin + Eigen3 bno055 - roscpp + eigen_conversions geometry_msgs + roscpp sensor_msgs - eigen_conversions + Eigen3 bno055 - roscpp + eigen_conversions geometry_msgs + roscpp sensor_msgs - eigen_conversions + Eigen3 bno055 - roscpp + eigen_conversions geometry_msgs + roscpp sensor_msgs - eigen_conversions