Replace enforcement of (old) C++14 standard with moveit_build_options()

Ubuntu 22.04 uses C++17 as default and fails on old C++14.
ros-o · Sep 13, 2023 · 2cc7bb9 · 2cc7bb9
1 parent ff6918e
commit 2cc7bb9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/moveit_calibration_gui/CMakeLists.txt b/moveit_calibration_gui/CMakeLists.txt
@@ -1,13 +1,6 @@
 cmake_minimum_required(VERSION 3.1.3)
 project(moveit_calibration_gui)
 
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Release)
-endif()
-
 find_package(catkin REQUIRED COMPONENTS
   class_loader
   cv_bridge
@@ -30,6 +23,8 @@ find_package(catkin REQUIRED COMPONENTS
 
 find_package(Eigen3 REQUIRED)
 
+moveit_build_options()
+
 # Qt Stuff
 if(rviz_QT_VERSION VERSION_LESS "5")
 	find_package(Qt4 ${rviz_QT_VERSION} REQUIRED QtCore QtGui)

diff --git a/moveit_calibration_plugins/CMakeLists.txt b/moveit_calibration_plugins/CMakeLists.txt
@@ -1,13 +1,6 @@
 cmake_minimum_required(VERSION 3.1.3)
 project(moveit_calibration_plugins)
 
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Release)
-endif()
-
 find_package(catkin REQUIRED COMPONENTS
   roscpp
   rosconsole
@@ -20,6 +13,9 @@ find_package(catkin REQUIRED COMPONENTS
 
 find_package(Eigen3 REQUIRED)
 find_package(OpenCV REQUIRED imgcodecs aruco)
+find_package(moveit_core REQUIRED)
+
+moveit_build_options()
 
 if(OpenCV_VERSION VERSION_EQUAL 3.2)
   message(WARNING "Your version of OpenCV (3.2) is known to have buggy ArUco pose detection! Use a ChArUco target or upgrade OpenCV")

diff --git a/moveit_calibration_plugins/package.xml b/moveit_calibration_plugins/package.xml
@@ -14,6 +14,7 @@
   <url type="repository">https://github.com/ros-planning/moveit_calibration</url>
 
   <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>moveit_core</build_depend>
 
   <depend>roscpp</depend>
   <depend>rosconsole</depend>