diff options
| author | Casey Bodley <cbodley@users.noreply.github.com> | 2024-06-27 17:35:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-27 17:35:32 +0200 |
| commit | 0a1d0933ad393691b894e83dfc824927da201b46 (patch) | |
| tree | febe866d64976bc7e4d21c9c649c23aae7e838c6 /CMakeLists.txt | |
| parent | Merge PR #53755 into main (diff) | |
| parent | submodule: Remove boost_redis submodule (diff) | |
| download | ceph-0a1d0933ad393691b894e83dfc824927da201b46.tar.xz ceph-0a1d0933ad393691b894e83dfc824927da201b46.zip | |
Merge pull request #57581 from adamemerson/wip-boost-1.85
build: Bump boost version to 1.85
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 62aaad94dc8..a6e7c0b3d6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,7 +282,10 @@ if(WITH_LIBURING) build_uring() endif() # enable uring in boost::asio - add_compile_definitions("BOOST_ASIO_HAS_IO_URING") + + if(CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL "5.10") + add_compile_definitions("BOOST_ASIO_HAS_IO_URING") + endif() endif() CMAKE_DEPENDENT_OPTION(WITH_BLUESTORE_PMEM "Enable PMDK libraries" OFF @@ -699,7 +702,7 @@ option(WITH_SYSTEM_BOOST "require and build with system Boost" OFF) # Boost::thread depends on Boost::atomic, so list it explicitly. set(BOOST_COMPONENTS atomic chrono thread system regex random program_options date_time - iostreams context coroutine) + iostreams context coroutine url) set(BOOST_HEADER_COMPONENTS container) if(WITH_MGR) @@ -728,7 +731,7 @@ if(WITH_SYSTEM_BOOST) if(BOOST_ROOT AND CMAKE_LIBRARY_ARCHITECTURE) set(BOOST_LIBRARYDIR "${BOOST_ROOT}/lib/${CMAKE_LIBRARY_ARCHITECTURE}") endif() - find_package(Boost 1.82 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) + find_package(Boost 1.85 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) if(NOT ENABLE_SHARED) set_property(TARGET Boost::iostreams APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) @@ -742,16 +745,11 @@ else() set(BOOST_J ${DEFAULT_BOOST_J} CACHE STRING "max jobs for Boost build") # override w/-DBOOST_J=<n> set(Boost_USE_STATIC_LIBS ON) include(BuildBoost) - build_boost(1.82 + build_boost(1.85 COMPONENTS ${BOOST_COMPONENTS} ${BOOST_HEADER_COMPONENTS}) endif() include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS}) -if(Boost_VERSION VERSION_LESS 1.84) - # This is a workaround for https://github.com/boostorg/phoenix/issues/111 - add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-DBOOST_PHOENIX_STL_TUPLE_H_>) -endif() - # dashboard angular2 frontend option(WITH_MGR_DASHBOARD_FRONTEND "Build the mgr/dashboard frontend using `npm`" ON) option(WITH_SYSTEM_NPM "Assume that dashboard build tools already installed through packages" OFF) |