From: Walter Fetter Lages Date: Wed, 9 Sep 2020 03:56:08 +0000 (-0300) Subject: Port to Noetic. X-Git-Url: http://git.ece.ufrgs.br/?a=commitdiff_plain;h=32cac4942d0d41829cccc8481e1df23ac28ec129;p=pose2d_trajectories.git Port to Noetic. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ac148f..2a4829b 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(pose2d_trajectories) ## Compile as C++11, supported in ROS Kinetic and newer @@ -131,7 +131,7 @@ add_library(${PROJECT_NAME} ## Add cmake target dependencies of the library ## as an example, code may need to be generated before libraries ## either from message generation or dynamic reconfigure -# add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) +add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) ## Declare a C++ executable ## With catkin_make all packages are built within a single CMake context @@ -174,16 +174,23 @@ target_link_libraries(pose2d_stamp ## 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 +## Mark executables for installation +## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html +install(TARGETS eight_trajectory pose2d_stamp + 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 08b7459..bb35cb3 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ pose2d_trajectories - 3.1.0 + 3.2.0 The pose2d_trajectories package