Update cmake_minimum_required VERSION to 3.10 plus a bit of cleanup

corot · Dec 15, 2021 · 1dbf9ab · 1dbf9ab
1 parent 609c586
commit 1dbf9ab
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ source /opt/ros/melodic/setup.bash
 rosdep update
 rosdep install --from-paths src /opt/ros/melodic --ignore-src --rosdistro melodic -y
 catkin build
-pip install --upgrade bidict ratelimit
+pip install --upgrade bidict ratelimit tk
 ```
 
 #### Prepare hardware ####

diff --git a/thorp_boards/CMakeLists.txt b/thorp_boards/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_boards)
 
 ## Find catkin macros and libraries

diff --git a/thorp_bringup/CMakeLists.txt b/thorp_bringup/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_bringup)
 
 find_package(catkin REQUIRED COMPONENTS)

diff --git a/thorp_cannon/CMakeLists.txt b/thorp_cannon/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_cannon)
 
 # Load catkin and all dependencies required for this package

diff --git a/thorp_costmap_layers/CMakeLists.txt b/thorp_costmap_layers/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_costmap_layers)
 
 # uncomment to enable OpenCV display of internally processed data (does not work on robot)

diff --git a/thorp_description/CMakeLists.txt b/thorp_description/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_description)
 
 find_package(catkin REQUIRED COMPONENTS)

diff --git a/thorp_manipulation/CMakeLists.txt b/thorp_manipulation/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_manipulation)
 
 find_package(catkin REQUIRED roscpp actionlib geometry_msgs moveit_msgs moveit_core visualization_msgs

diff --git a/thorp_mbf_plugins/CMakeLists.txt b/thorp_mbf_plugins/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_mbf_plugins)
 
 # Required to use auto variables and to_string

diff --git a/thorp_moveit_config/CMakeLists.txt b/thorp_moveit_config/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_moveit_config)
 
 find_package(catkin REQUIRED)

diff --git a/thorp_msgs/CMakeLists.txt b/thorp_msgs/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_msgs)
 find_package(catkin REQUIRED COMPONENTS std_msgs nav_msgs moveit_msgs geometry_msgs actionlib_msgs message_generation)
 

diff --git a/thorp_navigation/CMakeLists.txt b/thorp_navigation/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_navigation)
 
 find_package(catkin REQUIRED roscpp actionlib geometry_msgs mbf_msgs thorp_msgs thorp_toolkit

diff --git a/.../param/move_base_flex/behavior_trees.yaml → ...ation/graveyard/param/behavior_trees.yaml b/.../param/move_base_flex/behavior_trees.yaml → ...ation/graveyard/param/behavior_trees.yaml
diff --git a/thorp_perception/CMakeLists.txt b/thorp_perception/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_perception)
 
 find_package(catkin REQUIRED tf roscpp pcl_ros actionlib

diff --git a/thorp_simulation/CMakeLists.txt b/thorp_simulation/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_simulation)
 
 find_package(gazebo REQUIRED)

diff --git a/thorp_smach/CMakeLists.txt b/thorp_smach/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_smach)
 
 find_package(catkin REQUIRED)

diff --git a/thorp_toolkit/CMakeLists.txt b/thorp_toolkit/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(thorp_toolkit)
 
 ##############################################################################