From dea9b98de1439daf36405b883eb4d8bc269f1679 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Tue, 12 Sep 2023 22:22:29 +0200 Subject: [PATCH] Remove enforcement of C++14 standard Compilers already default to C++17 nowadays and log4cxx requires C++17 on Ubuntu Jammy. --- franka_control/CMakeLists.txt | 3 --- franka_example_controllers/CMakeLists.txt | 2 -- franka_gazebo/CMakeLists.txt | 3 --- franka_gripper/CMakeLists.txt | 3 --- franka_hw/CMakeLists.txt | 3 --- franka_visualization/CMakeLists.txt | 3 --- 6 files changed, 17 deletions(-) diff --git a/franka_control/CMakeLists.txt b/franka_control/CMakeLists.txt index b2e24688f..a1bbf1122 100644 --- a/franka_control/CMakeLists.txt +++ b/franka_control/CMakeLists.txt @@ -1,9 +1,6 @@ cmake_minimum_required(VERSION 3.4) project(franka_control) -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - find_package(catkin REQUIRED COMPONENTS controller_interface controller_manager diff --git a/franka_example_controllers/CMakeLists.txt b/franka_example_controllers/CMakeLists.txt index 2ad6b6b09..5486f3178 100644 --- a/franka_example_controllers/CMakeLists.txt +++ b/franka_example_controllers/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.4) project(franka_example_controllers) set(CMAKE_BUILD_TYPE Release) -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(catkin REQUIRED COMPONENTS controller_interface diff --git a/franka_gazebo/CMakeLists.txt b/franka_gazebo/CMakeLists.txt index 56bdcae13..8757b7949 100644 --- a/franka_gazebo/CMakeLists.txt +++ b/franka_gazebo/CMakeLists.txt @@ -11,9 +11,6 @@ if(${ARCHITECTURE} STREQUAL "armv7l") endif() -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - # Load catkin and all dependencies required for this package find_package(catkin REQUIRED COMPONENTS gazebo_dev diff --git a/franka_gripper/CMakeLists.txt b/franka_gripper/CMakeLists.txt index 6a830b389..ca97e652f 100644 --- a/franka_gripper/CMakeLists.txt +++ b/franka_gripper/CMakeLists.txt @@ -1,9 +1,6 @@ cmake_minimum_required(VERSION 3.4) project(franka_gripper) -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - find_package(catkin REQUIRED COMPONENTS roscpp message_generation diff --git a/franka_hw/CMakeLists.txt b/franka_hw/CMakeLists.txt index d7888a831..2f5bcbcb1 100644 --- a/franka_hw/CMakeLists.txt +++ b/franka_hw/CMakeLists.txt @@ -1,9 +1,6 @@ cmake_minimum_required(VERSION 3.4) project(franka_hw) -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - find_package(catkin REQUIRED COMPONENTS actionlib controller_interface diff --git a/franka_visualization/CMakeLists.txt b/franka_visualization/CMakeLists.txt index d8c55a32c..9d830b4e5 100644 --- a/franka_visualization/CMakeLists.txt +++ b/franka_visualization/CMakeLists.txt @@ -1,9 +1,6 @@ cmake_minimum_required(VERSION 3.4) project(franka_visualization) -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - find_package(catkin REQUIRED COMPONENTS sensor_msgs roscpp