From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 15 Dec 2023 10:04:53 +0000 (+0800)
Subject: cmake: only apply workaround for boost < 1.84
X-Git-Tag: testing/wip-batrick-testing-20240411.154038~753^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c24a4c19848fefcfecbc9f706cccacf2e93b3f14;p=ceph-ci.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 <tchaikov@gmail.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4feb22c135e..1364426067c 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($<$<COMPILE_LANGUAGE:CXX>:-DBOOST_PHOENIX_STL_TUPLE_H_>)
 endif()