From: Kefu Chai Date: Fri, 15 Dec 2023 10:04:53 +0000 (+0800) Subject: cmake: only apply workaround for boost < 1.84 X-Git-Tag: v19.3.0~335^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F54916%2Fhead;p=ceph.git cmake: only apply workaround for boost < 1.84 https://github.com/boostorg/phoenix/issues/111 was fixed in master. see the fix which addresses the issue: https://github.com/boostorg/phoenix/commit/8913607a3788cb82d48ed461ea59c919b7bad3df Signed-off-by: Kefu Chai --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 4feb22c135e1..1364426067ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -703,7 +703,7 @@ else() endif() include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS}) -if(Boost_VERSION VERSION_EQUAL 1.81 OR Boost_VERSION VERSION_EQUAL 1.82) +if(Boost_VERSION VERSION_LESS 1.84) # This is a workaround for https://github.com/boostorg/phoenix/issues/111 add_compile_options($<$:-DBOOST_PHOENIX_STL_TUPLE_H_>) endif()