From bd45f157d37fd7c23539134178481c1998d62ac7 Mon Sep 17 00:00:00 2001 From: v4hn Date: Thu, 30 Nov 2023 15:04:37 +0100 Subject: [PATCH] drop explicit requests for c++11 C++11 has been the default for compilers targeted in this branch. gtest requires c++14 since v1.13 (Jan 2023) and building the tests on newer systems fails. --- industrial_robot_client/CMakeLists.txt | 3 --- industrial_trajectory_filters/CMakeLists.txt | 2 -- simple_message/CMakeLists.txt | 3 --- 3 files changed, 8 deletions(-) diff --git a/industrial_robot_client/CMakeLists.txt b/industrial_robot_client/CMakeLists.txt index 0bf3025e..97442f6b 100644 --- a/industrial_robot_client/CMakeLists.txt +++ b/industrial_robot_client/CMakeLists.txt @@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.0.2) project(industrial_robot_client) -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - find_package(catkin REQUIRED COMPONENTS actionlib actionlib_msgs control_msgs industrial_msgs industrial_utils roscpp sensor_msgs simple_message std_msgs trajectory_msgs urdf) diff --git a/industrial_trajectory_filters/CMakeLists.txt b/industrial_trajectory_filters/CMakeLists.txt index 1ea3fefc..91a77871 100644 --- a/industrial_trajectory_filters/CMakeLists.txt +++ b/industrial_trajectory_filters/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.0.2) project(industrial_trajectory_filters) -add_compile_options(-std=c++11) - find_package(catkin REQUIRED COMPONENTS class_loader moveit_core diff --git a/simple_message/CMakeLists.txt b/simple_message/CMakeLists.txt index 5554025c..d7b349de 100644 --- a/simple_message/CMakeLists.txt +++ b/simple_message/CMakeLists.txt @@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.0.2) project(simple_message) -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - find_package(catkin REQUIRED COMPONENTS industrial_msgs roscpp) # The simple message make file builds three libraries: simple_message,