From: Walter Fetter Lages Date: Wed, 9 Sep 2020 06:08:34 +0000 (-0300) Subject: Port to Noetic. X-Git-Url: http://git.ece.ufrgs.br/?a=commitdiff_plain;h=b5c7644f905ae0fee5bd4cfc93dbf71ef673e9c0;p=gfxtablet_ros.git Port to Noetic. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index c7f6170..c8574e0 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(gfxtablet_ros) ## Compile as C++11, supported in ROS Kinetic and newer @@ -115,7 +115,7 @@ catkin_package( ## Specify additional locations of header files ## Your package locations should be listed before other locations include_directories( - include + include ${catkin_INCLUDE_DIRS} ) @@ -158,16 +158,23 @@ target_link_libraries(gfxtablet_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 5c6e60b..dd3a70f 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ gfxtablet_ros - 2.0.0 + 2.1.0 The gfxtablet_ros package @@ -28,6 +28,7 @@ Walter Fetter Lages +