Skip to content

Commit 22627ef

Browse files
committed
chore: remove cmake minium version deprecation warning
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).
1 parent 30dc6b8 commit 22627ef

File tree

11 files changed

+43
-10
lines changed

11 files changed

+43
-10
lines changed

franka_control/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.4)
1+
cmake_minimum_required(VERSION 3.10)
22
project(franka_control)
33

44
set(CMAKE_CXX_STANDARD 14)

franka_description/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.4)
1+
cmake_minimum_required(VERSION 3.10)
22
project(franka_description)
33

44
find_package(catkin REQUIRED)

franka_example_controllers/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.4)
1+
cmake_minimum_required(VERSION 3.10)
22
project(franka_example_controllers)
33

44
set(CMAKE_BUILD_TYPE Release)
@@ -159,4 +159,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/PepTools.cmake OPTIONAL
159159
if(PEP_TOOLS)
160160
file(GLOB_RECURSE PYSOURCES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.py)
161161
add_pyformat_target(franka_control FILES ${PYSOURCES})
162-
endif()
162+
endif()

franka_gazebo/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.4)
1+
cmake_minimum_required(VERSION 3.10)
22
project(franka_gazebo)
33

44
execute_process(COMMAND uname -m
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
3+
<model>
4+
<name>Ambient sun</name>
5+
<version>1.0</version>
6+
<sdf version="1.5">model.sdf</sdf>
7+
8+
<author>
9+
<name>Nate Koenig</name>
10+
<email>[email protected]</email>
11+
</author>
12+
13+
<description>
14+
A ambient light for the sun.
15+
</description>
16+
</model>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" ?>
2+
<sdf version="1.5">
3+
<light type="directional" name="ambient">
4+
<cast_shadows>true</cast_shadows>
5+
<pose>0 0 10 0 0 0</pose>
6+
<diffuse>0.8 0.8 0.8 1</diffuse>
7+
<specular>0.2 0.2 0.2 1</specular>
8+
<ambient>0.4 0.4 0.4 1</ambient>
9+
<attenuation>
10+
<range>1000</range>
11+
<constant>0.9</constant>
12+
<linear>0.01</linear>
13+
<quadratic>0.001</quadratic>
14+
</attenuation>
15+
<direction>-0.5 0.1 -0.9</direction>
16+
</light>
17+
</sdf>

franka_gripper/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.4)
1+
cmake_minimum_required(VERSION 3.10)
22
project(franka_gripper)
33

44
set(CMAKE_CXX_STANDARD 14)

franka_hw/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.4)
1+
cmake_minimum_required(VERSION 3.10)
22
project(franka_hw)
33

44
set(CMAKE_CXX_STANDARD 14)

franka_msgs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.4)
1+
cmake_minimum_required(VERSION 3.10)
22
project(franka_msgs)
33

44
find_package(catkin REQUIRED COMPONENTS message_generation std_msgs actionlib_msgs)

franka_ros/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1.3)
1+
cmake_minimum_required(VERSION 3.10)
22
project(franka_ros)
33
find_package(catkin REQUIRED)
44
catkin_metapackage()

0 commit comments

Comments
 (0)