Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 161 additions & 0 deletions extra/ompl/0001-remove-boost.system-as-a-dependency.-unused-1306.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
From 49eebff920f10aac2cf3385097a02f8716068629 Mon Sep 17 00:00:00 2001
From: Mark Moll <[email protected]>
Date: Mon, 18 Aug 2025 09:07:31 -0700
Subject: [PATCH 1/2] remove boost.system as a dependency. unused (#1306)

---
.github/workflows/build.yml | 3 +--
CMakeLists.txt | 2 +-
CMakeModules/CPackSettings.cmake | 2 +-
CMakeModules/OMPLUtils.cmake | 1 -
demos/CMakeLists.txt | 1 -
install-ompl-ubuntu.sh.in | 1 -
omplConfig.cmake.in | 2 +-
scripts/docker/ompl.Dockerfile | 2 --
src/ompl/CMakeLists.txt | 1 -
vcpkg.json | 1 -
10 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fa0c8db6..093cdc72 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,7 +41,6 @@ jobs:
libboost-filesystem-dev \
libboost-program-options-dev \
libboost-serialization-dev \
- libboost-system-dev \
libboost-test-dev \
libeigen3-dev \
libflann-dev \
@@ -58,7 +57,7 @@ jobs:
with:
vcpkgGitCommitId: da4b78d35084ec4e9808aa02017028da03b8d2ab
vcpkgTriplet: 'x64-windows'
- vcpkgArguments: 'boost-dynamic-bitset boost-filesystem boost-graph boost-odeint boost-program-options boost-serialization boost-system boost-test eigen3 flann'
+ vcpkgArguments: 'boost-dynamic-bitset boost-filesystem boost-graph boost-odeint boost-program-options boost-serialization boost-test eigen3 flann'

- name: Build & Test (Linux, macOS)
if: runner.os != 'Windows'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb7797b6..bc655506 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ set_package_properties(Boost PROPERTIES
URL "https://www.boost.org"
PURPOSE "Used throughout OMPL for data serialization, graphs, etc.")
set(Boost_USE_MULTITHREADED ON)
-find_package(Boost 1.68 REQUIRED COMPONENTS serialization filesystem system program_options)
+find_package(Boost 1.68 REQUIRED COMPONENTS serialization filesystem program_options)

# on macOS we need to check whether to use libc++ or libstdc++ with clang++
if(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
diff --git a/CMakeModules/CPackSettings.cmake b/CMakeModules/CPackSettings.cmake
index 911f838a..00009157 100644
--- a/CMakeModules/CPackSettings.cmake
+++ b/CMakeModules/CPackSettings.cmake
@@ -45,7 +45,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
OUTPUT_VARIABLE UBUNTU_RELEASE
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}_${PROJECT_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}-Ubuntu${UBUNTU_RELEASE}")
- set(CPACK_DEBIAN_PACKAGE_DEPENDS "python${PYTHON_VERSION}, libboost-serialization-dev, libboost-filesystem-dev, libboost-system-dev, libboost-program-options-dev, libboost-test-dev, libtriangle-dev")
+ set(CPACK_DEBIAN_PACKAGE_DEPENDS "python${PYTHON_VERSION}, libboost-serialization-dev, libboost-filesystem-dev, libboost-program-options-dev, libboost-test-dev, libtriangle-dev")
endif()

if(WIN32)
diff --git a/CMakeModules/OMPLUtils.cmake b/CMakeModules/OMPLUtils.cmake
index ddd6f9af..9a63df7d 100644
--- a/CMakeModules/OMPLUtils.cmake
+++ b/CMakeModules/OMPLUtils.cmake
@@ -5,7 +5,6 @@ macro(add_ompl_test test_name)
Boost::program_options
Boost::serialization
Boost::filesystem
- Boost::system
Boost::unit_test_framework)
add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
endmacro(add_ompl_test)
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index 0de32227..47547279 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -12,7 +12,6 @@ if (OMPL_BUILD_DEMOS)
ompl::ompl
Eigen3::Eigen
Boost::filesystem
- Boost::system
Boost::program_options)
endmacro(add_ompl_demo)

diff --git a/install-ompl-ubuntu.sh.in b/install-ompl-ubuntu.sh.in
index 79f60e30..86f62f5e 100755
--- a/install-ompl-ubuntu.sh.in
+++ b/install-ompl-ubuntu.sh.in
@@ -20,7 +20,6 @@ install_common_dependencies()
libboost-filesystem-dev \
libboost-program-options-dev \
libboost-serialization-dev \
- libboost-system-dev \
libboost-test-dev \
libeigen3-dev \
libexpat1 \
diff --git a/omplConfig.cmake.in b/omplConfig.cmake.in
index f1d47855..5f40fe11 100644
--- a/omplConfig.cmake.in
+++ b/omplConfig.cmake.in
@@ -12,7 +12,7 @@ set_and_check(OMPL_INCLUDE_DIRS @PACKAGE_INCLUDE_INSTALL_DIR@)

include ("${CMAKE_CURRENT_LIST_DIR}/omplExport.cmake" )
include(CMakeFindDependencyMacro)
-set(_@PROJECT_NAME@_boost_components serialization filesystem system)
+set(_@PROJECT_NAME@_boost_components serialization filesystem)
find_dependency(Boost REQUIRED COMPONENTS ${_@PROJECT_NAME@_boost_components})
if(Boost_FOUND)
foreach(_comp ${_@PROJECT_NAME@_boost_components})
diff --git a/scripts/docker/ompl.Dockerfile b/scripts/docker/ompl.Dockerfile
index 89987016..b20a97e7 100644
--- a/scripts/docker/ompl.Dockerfile
+++ b/scripts/docker/ompl.Dockerfile
@@ -13,7 +13,6 @@ RUN apt-get update && \
libboost-program-options-dev \
libboost-python-dev \
libboost-serialization-dev \
- libboost-system-dev \
libboost-test-dev \
libeigen3-dev \
libexpat1 \
@@ -58,7 +57,6 @@ RUN apt-get update && \
libboost-program-options-dev \
libboost-python-dev \
libboost-serialization-dev \
- libboost-system-dev \
libeigen3-dev \
libflann-dev \
libtriangle-dev \
diff --git a/src/ompl/CMakeLists.txt b/src/ompl/CMakeLists.txt
index 463930ca..82911ef2 100644
--- a/src/ompl/CMakeLists.txt
+++ b/src/ompl/CMakeLists.txt
@@ -44,7 +44,6 @@ target_link_libraries(ompl
PUBLIC
Boost::filesystem
Boost::serialization
- Boost::system
Eigen3::Eigen
"$<$<BOOL:${Threads_FOUND}>:Threads::Threads>"
"$<$<BOOL:${OMPL_HAVE_FLANN}>:flann::flann>"
diff --git a/vcpkg.json b/vcpkg.json
index aa07572a..9690014d 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -7,7 +7,6 @@
"boost-odeint",
"boost-program-options",
"boost-serialization",
- "boost-system",
"boost-test",
"eigen3",
"flann"
--
2.52.0

Loading