From: Thomas Goirand Date: Sun, 13 Dec 2020 15:33:57 +0000 (+0000) Subject: Another cmakelists fix X-Git-Tag: archive/raspbian/14.2.15-4+rpi1^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c5e5c30d69fb4d6a6132ae3b1e9a2b114a2f10a9;p=ceph.git Another cmakelists fix Forwarded: no Last-Update: 2021-01-08 This fixes the last Boost 1.74 compatibility problems. Gbp-Pq: Name another-cmakelists-fix.patch --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 00d497042..9a0a88e18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,9 @@ endif() if(POLICY CMP0075) cmake_policy(SET CMP0075 NEW) endif() +if(POLICY CMP0093) + cmake_policy(SET CMP0093 NEW) +endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/") if(CMAKE_SYSTEM_NAME MATCHES "Linux") diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 9bfde0e45..d9bebc6d4 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -19,6 +19,10 @@ function(gperf_generate input output) ) endfunction() +if(Boost_VERSION VERSION_GREATER_EQUAL 1.74) + add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT) +endif() + set(librgw_common_srcs services/svc_finisher.cc services/svc_notify.cc