projects / q2d.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a044890)
Port to Noetic.
authorWalter Fetter Lages <w.fetter@ieee.org>
Tue, 16 Jun 2020 20:16:31 +0000 (17:16 -0300)
committerWalter Fetter Lages <w.fetter@ieee.org>
Tue, 16 Jun 2020 20:16:31 +0000 (17:16 -0300)
q2d_bringup/CMakeLists.txt patch | blob | history
q2d_bringup/package.xml patch | blob | history
q2d_description/CMakeLists.txt patch | blob | history
q2d_description/package.xml patch | blob | history
q2d_teleop/CMakeLists.txt patch | blob | history
q2d_teleop/package.xml patch | blob | history

diff --git a/q2d_bringup/CMakeLists.txt b/q2d_bringup/CMakeLists.txt
index 8f9369d..dc48a74 100644 (file)
--- a/q2d_bringup/CMakeLists.txt
+++ b/q2d_bringup/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(q2d_bringup)
 
 ## Compile as C++11, supported in ROS Kinetic and newer
@@ -158,16 +158,23 @@ include_directories(
 
 ## 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/q2d_bringup/package.xml b/q2d_bringup/package.xml
index 0bdfda4..d371d39 100644 (file)
--- a/q2d_bringup/package.xml
+++ b/q2d_bringup/package.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>q2d_bringup</name>
-  <version>2.0.0</version>
+  <version>2.1.0</version>
   <description>The q2d_bringup package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
   <!-- Example:  -->
   <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
-  <maintainer email="fetter@ece.ufrgs.br">Walter Fetter Lages</maintainer>
+    <maintainer email="fetter@ece.ufrgs.br">Walter Fetter Lages</maintainer>
+
 
   <!-- One license tag required, multiple allowed, one license per tag -->
   <!-- Commonly used license strings: -->
diff --git a/q2d_description/CMakeLists.txt b/q2d_description/CMakeLists.txt
index 9f52322..c43f517 100644 (file)
--- a/q2d_description/CMakeLists.txt
+++ b/q2d_description/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(q2d_description)
 
 ## Compile as C++11, supported in ROS Kinetic and newer
@@ -155,16 +155,23 @@ include_directories(
 
 ## 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/q2d_description/package.xml b/q2d_description/package.xml
index 00b1f1e..519c694 100644 (file)
--- a/q2d_description/package.xml
+++ b/q2d_description/package.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>q2d_description</name>
-  <version>2.0.0</version>
+  <version>2.1.0</version>
   <description>The q2d_description package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
   <!-- Example:  -->
   <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
-  <maintainer email="gui.a.ritter@gmail.com">Guilherme Alan Ritter</maintainer>
   <maintainer email="fetter@ee.ufrgs.br">Walter Fetter Lages</maintainer>
 
-
   <!-- One license tag required, multiple allowed, one license per tag -->
   <!-- Commonly used license strings: -->
   <!--   BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
diff --git a/q2d_teleop/CMakeLists.txt b/q2d_teleop/CMakeLists.txt
index 884a661..695a618 100644 (file)
--- a/q2d_teleop/CMakeLists.txt
+++ b/q2d_teleop/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(q2d_teleop)
 
 ## Compile as C++11, supported in ROS Kinetic and newer
@@ -111,8 +111,8 @@ find_package(orocos_kdl REQUIRED)
 catkin_package(
 #  INCLUDE_DIRS include
 #  LIBRARIES q2d_teleop
-#  CATKIN_DEPENDS cmake_modules geometry_msgs kdl_parser orocos_kdl roscpp sensor_msgs std_msgs urdf
-#  DEPENDS system_lib
+#  CATKIN_DEPENDS cmake_modules geometry_msgs kdl_parser roscpp sensor_msgs std_msgs urdf
+#  DEPENDS orocos_kdl
 )
 
 ###########
@@ -124,7 +124,7 @@ catkin_package(
 include_directories(
 # include
   ${catkin_INCLUDE_DIRS}
-# TODO: Check names of system library include directories (Eigen)
+# TODO: Check names of system library include directories (orocos_kdl)
   ${EIGEN3_INCLUDE_DIRS}
   ${orocos_kdl_INCLUDE_DIRS}
 )
@@ -177,16 +177,23 @@ target_link_libraries(q2d_teleop_rviz
 
 ## 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/q2d_teleop/package.xml b/q2d_teleop/package.xml
index ea79ddb..3c36231 100644 (file)
--- a/q2d_teleop/package.xml
+++ b/q2d_teleop/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>q2d_teleop</name>
-  <version>2.0.0</version>
+  <version>2.1.0</version>
   <description>The q2d_teleop package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
@@ -27,7 +27,6 @@
   <!-- <author email="jane.doe@example.com">Jane Doe</author> -->
   <author email="fetter@ece.ufrgs.br">Walter Fetter Lages</author>
 
-
   <!-- The *depend tags are used to specify dependencies -->
   <!-- Dependencies can be catkin packages or system dependencies -->
   <!-- Examples: -->
@@ -49,7 +48,7 @@
   <!-- Use doc_depend for packages you need only for building documentation: -->
   <!--   <doc_depend>doxygen</doc_depend> -->
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>Eigen</build_depend>
+  <build_depend>Eigen3</build_depend>
   <build_depend>cmake_modules</build_depend>
   <build_depend>geometry_msgs</build_depend>
   <build_depend>kdl_parser</build_depend>
@@ -58,7 +57,7 @@
   <build_depend>sensor_msgs</build_depend>
   <build_depend>std_msgs</build_depend>
   <build_depend>urdf</build_depend>
-  <build_export_depend>Eigen</build_export_depend>
+  <build_export_depend>Eigen3</build_export_depend>
   <build_export_depend>cmake_modules</build_export_depend>
   <build_export_depend>geometry_msgs</build_export_depend>
   <build_export_depend>kdl_parser</build_export_depend>
@@ -67,7 +66,7 @@
   <build_export_depend>sensor_msgs</build_export_depend>
   <build_export_depend>std_msgs</build_export_depend>
   <build_export_depend>urdf</build_export_depend>
-  <exec_depend>Eigen</exec_depend>
+  <build_depend>Eigen3</build_depend>
   <exec_depend>cmake_modules</exec_depend>
   <exec_depend>geometry_msgs</exec_depend>
   <exec_depend>kdl_parser</exec_depend>
Quanser 2DSJFE ROS meta-package.