Skip to content

Commit

Permalink
chore: remove cmake minium version deprecation warning
Browse files Browse the repository at this point in the history
This commit ensure that the cmake minimum version < 3.5 deprecation
warning is no longer thrown. The minimum cmake version was updated to
3.10 as this is the version that is recommended by the [ROS noetic migration
guide](https://wiki.ros.org/noetic/Migration#Increase_required_CMake_version_to_avoid_author_warning).
  • Loading branch information
rickstaa committed Sep 4, 2023
1 parent d439fc7 commit 3829763
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Requires `libfranka` >= 0.8.0
* `franka_gazebo`: `FrankaHWSim` only acts on joints belonging to a Franka robot. This allows to combine a Franka robot and others (like mobile platforms) in same URDF ([#313](https://github.com/frankaemika/franka_ros/issues/313))
* `franka_description`: `<xacro:franka_robot/>` macro now supports to customize the `parent` frame and its `xyz` + `rpy` offset
* `franka_hw`: Fix the bug where the previous controller is still running after switching the controller. ([#326](https://github.com/frankaemika/franka_ros/issues/326))
* Update minimum CMake version to 3.10 to remove deprecation warnings

## 0.10.1 - 2022-09-15

Expand Down
2 changes: 1 addition & 1 deletion franka_control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.4)
cmake_minimum_required(VERSION 3.10)
project(franka_control)

set(CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion franka_description/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.4)
cmake_minimum_required(VERSION 3.10)
project(franka_description)

find_package(catkin REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion franka_example_controllers/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.4)
cmake_minimum_required(VERSION 3.10)
project(franka_example_controllers)

set(CMAKE_BUILD_TYPE Release)
Expand Down
2 changes: 1 addition & 1 deletion franka_gazebo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.4)
cmake_minimum_required(VERSION 3.10)
project(franka_gazebo)

execute_process(COMMAND uname -m
Expand Down
16 changes: 16 additions & 0 deletions franka_gazebo/models/ambient_sun/model.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0"?>

<model>
<name>Ambient sun</name>
<version>1.0</version>
<sdf version="1.5">model.sdf</sdf>

<author>
<name>Nate Koenig</name>
<email>nate@osrfoundation.org</email>
</author>

<description>
A ambient light for the sun.
</description>
</model>
17 changes: 17 additions & 0 deletions franka_gazebo/models/ambient_sun/model.sdf
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" ?>
<sdf version="1.5">
<light type="directional" name="ambient">
<cast_shadows>true</cast_shadows>
<pose>0 0 10 0 0 0</pose>
<diffuse>0.8 0.8 0.8 1</diffuse>
<specular>0.2 0.2 0.2 1</specular>
<ambient>0.4 0.4 0.4 1</ambient>
<attenuation>
<range>1000</range>
<constant>0.9</constant>
<linear>0.01</linear>
<quadratic>0.001</quadratic>
</attenuation>
<direction>-0.5 0.1 -0.9</direction>
</light>
</sdf>
2 changes: 1 addition & 1 deletion franka_gripper/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.4)
cmake_minimum_required(VERSION 3.10)
project(franka_gripper)

set(CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion franka_hw/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.4)
cmake_minimum_required(VERSION 3.10)
project(franka_hw)

set(CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion franka_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.4)
cmake_minimum_required(VERSION 3.10)
project(franka_msgs)

find_package(catkin REQUIRED COMPONENTS message_generation std_msgs actionlib_msgs)
Expand Down
2 changes: 1 addition & 1 deletion franka_ros/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1.3)
cmake_minimum_required(VERSION 2.8.3)
project(franka_ros)
find_package(catkin REQUIRED)
catkin_metapackage()
2 changes: 1 addition & 1 deletion franka_visualization/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.4)
cmake_minimum_required(VERSION 3.10)
project(franka_visualization)

set(CMAKE_CXX_STANDARD 14)
Expand Down

0 comments on commit 3829763

Please sign in to comment.