Use moveit_common package to moveit_ros_warehouse

moveit · Oct 21, 2020 · f958bfe · f958bfe
1 parent f4f7557
commit f958bfe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/moveit_ros/warehouse/CMakeLists.txt b/moveit_ros/warehouse/CMakeLists.txt
@@ -1,18 +1,12 @@
 cmake_minimum_required(VERSION 3.10.2)
 project(moveit_ros_warehouse)
 
-if(NOT "${CMAKE_CXX_STANDARD}")
-  set(CMAKE_CXX_STANDARD 14)
-endif()
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Release)
-endif()
+# Common cmake code applied to all moveit packages
+find_package(moveit_common REQUIRED)
+moveit_package()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  add_compile_options(-Wall -Wextra -Wpedantic)
+  add_compile_options(-Wpedantic)
 endif()
 
 find_package(ament_cmake REQUIRED)

diff --git a/moveit_ros/warehouse/package.xml b/moveit_ros/warehouse/package.xml
@@ -15,7 +15,8 @@
   <url type="repository">https://github.com/ros-planning/moveit</url>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
-
+  <build_depend>moveit_common</build_depend>
+
   <depend>rclcpp</depend>
   <depend>moveit_core</depend>
   <depend>warehouse_ros</depend>