From ca83943291c3be353c8b53169bccdf85e35f6298 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Wed, 6 Aug 2025 20:07:22 +0200 Subject: [PATCH 1/5] link boost process --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 452d3f09d..6ef0c16aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,9 +72,9 @@ else () message(FATAL_ERROR "Can not find Boost") endif () if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread-mt") + set(_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread-mt boost_process") else () - set(_KEYVI_LINK_LIBRARIES_DYNAMIC "${_KEYVI_LINK_LIBRARIES_DYNAMIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread") + set(_KEYVI_LINK_LIBRARIES_DYNAMIC "${_KEYVI_LINK_LIBRARIES_DYNAMIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread boost_process") endif () if (WIN32) From b68c9e7ab54a71a0a6d5740d0a298b6933aed733 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Wed, 6 Aug 2025 21:00:19 +0200 Subject: [PATCH 2/5] use latest boost for mac --- .github/workflows/python-cibuildwheel.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/python-cibuildwheel.yml b/.github/workflows/python-cibuildwheel.yml index 166f201d0..f01a4af01 100644 --- a/.github/workflows/python-cibuildwheel.yml +++ b/.github/workflows/python-cibuildwheel.yml @@ -64,8 +64,7 @@ jobs: run: | brew update && \ brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done && \ - brew install ccache zlib snappy boost@1.85 - brew link boost@1.85 + brew install ccache zlib snappy boost - name: set mac deployment target X64 if: runner.os == 'macOS' && runner.arch == 'X64' From 349a00c5632318fd4c1ccb28256a3e23871fa2f9 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Wed, 6 Aug 2025 21:20:54 +0200 Subject: [PATCH 3/5] no boost-mt on mac --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ef0c16aa..ea774830c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,7 @@ else () message(FATAL_ERROR "Can not find Boost") endif () if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread-mt boost_process") + set(_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread boost_process") else () set(_KEYVI_LINK_LIBRARIES_DYNAMIC "${_KEYVI_LINK_LIBRARIES_DYNAMIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread boost_process") endif () From b2060658376a221f057ffb05c53c08b64185430c Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Wed, 6 Aug 2025 22:25:01 +0200 Subject: [PATCH 4/5] link boost process only for >= 1.86.0 --- CMakeLists.txt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea774830c..511b68dff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,16 +65,28 @@ set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_MULTITHREADED ON) set(Boost_USE_STATIC_RUNTIME OFF) -find_package(Boost REQUIRED COMPONENTS ${_KEYVI_BOOST_LIBRARIES} ${_KEYVI_BOOST_LIBRARIES_TEST}) +if(POLICY CMP0167) # Use upstream's FindBoost.cmake to find Boost libraries. + cmake_policy(SET CMP0167 NEW) +endif() + +find_package(Boost 1.80 REQUIRED COMPONENTS ${_KEYVI_BOOST_LIBRARIES} ${_KEYVI_BOOST_LIBRARIES_TEST}) if (Boost_FOUND) list(APPEND KEYVI_INCLUDES "${Boost_INCLUDE_DIRS}") else () message(FATAL_ERROR "Can not find Boost") endif () if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread boost_process") + set(_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread") else () - set(_KEYVI_LINK_LIBRARIES_DYNAMIC "${_KEYVI_LINK_LIBRARIES_DYNAMIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread boost_process") + set(_KEYVI_LINK_LIBRARIES_DYNAMIC "${_KEYVI_LINK_LIBRARIES_DYNAMIC} boost_program_options boost_iostreams boost_filesystem boost_system boost_regex boost_thread") +endif () + +if(Boost_VERSION VERSION_GREATER_EQUAL "1.86.0") + if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(_KEYVI_LINK_LIBRARIES_STATIC "${_KEYVI_LINK_LIBRARIES_STATIC} boost_process") + else () + set(_KEYVI_LINK_LIBRARIES_DYNAMIC "${_KEYVI_LINK_LIBRARIES_DYNAMIC} boost_process") + endif () endif () if (WIN32) From 65cc46b92bc9860a1c00cf91867a6d6a1f3cf008 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Thu, 7 Aug 2025 06:55:29 +0200 Subject: [PATCH 5/5] bump ubuntu version for rust worflow to get a newer boost version --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 47a7fa526..14393de4a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -11,7 +11,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Install system packages