From 7702a6d671cedb471fb367b42c736763579fac44 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 14 Oct 2023 14:55:00 +0200 Subject: [PATCH] Delete patch/ros-noetic-moveit-core.patch --- patch/ros-noetic-moveit-core.patch | 68 ------------------------------ 1 file changed, 68 deletions(-) delete mode 100644 patch/ros-noetic-moveit-core.patch diff --git a/patch/ros-noetic-moveit-core.patch b/patch/ros-noetic-moveit-core.patch deleted file mode 100644 index c676b3d9a..000000000 --- a/patch/ros-noetic-moveit-core.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6070e14d1..54e5f3218 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,8 +51,14 @@ else() - endif() - - find_package(octomap REQUIRED) -+ - find_package(ruckig REQUIRED) -+# work around catkin_package not fetching the interface includes from the target -+# to forward to downstream dependencies. The includes do not need to be added -+# in include_directories below because the target is correctly imported here. -+get_target_property(ruckig_INCLUDE_DIRS ruckig::ruckig INTERFACE_INCLUDE_DIRECTORIES) - set(ruckig_LIBRARIES "ruckig::ruckig") -+ - find_package(urdfdom REQUIRED) - find_package(urdfdom_headers REQUIRED) - -diff --git a/cmake/moveit.cmake b/cmake/moveit.cmake -index 134412ab3..83163d534 100644 ---- a/cmake/moveit.cmake -+++ b/cmake/moveit.cmake -@@ -1,8 +1,9 @@ - macro(moveit_build_options) -- # for Bionic -- if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9") -+ # for Ubuntu bionic/focal -+ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "11") OR -+ (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "16")) - if(NOT "${CMAKE_CXX_STANDARD}") -- set(CMAKE_CXX_STANDARD 14) -+ set(CMAKE_CXX_STANDARD 17) - endif() - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) -diff --git a/collision_detector_bullet_description.xml b/collision_detector_bullet_description.xml -index 6d90496ea..b7f688682 100644 ---- a/collision_detector_bullet_description.xml -+++ b/collision_detector_bullet_description.xml -@@ -1,4 +1,4 @@ -- -+ - - -diff --git a/collision_detector_fcl_description.xml b/collision_detector_fcl_description.xml -index f96b06c05..794b8ea2a 100644 ---- a/collision_detector_fcl_description.xml -+++ b/collision_detector_fcl_description.xml -@@ -1,4 +1,4 @@ -- -+ - - -diff --git a/trajectory_processing/include/moveit/trajectory_processing/ruckig_traj_smoothing.h b/trajectory_processing/include/moveit/trajectory_processing/ruckig_traj_smoothing.h -index 4671db898..d79b2645e 100644 ---- a/trajectory_processing/include/moveit/trajectory_processing/ruckig_traj_smoothing.h -+++ b/trajectory_processing/include/moveit/trajectory_processing/ruckig_traj_smoothing.h -@@ -37,6 +37,7 @@ - - #include - #include -+#include - #include - #include -