]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cmake: only apply workaround for boost < 1.84
authorKefu Chai <tchaikov@gmail.com>
Fri, 15 Dec 2023 10:04:53 +0000 (18:04 +0800)
committerKefu Chai <tchaikov@gmail.com>
Fri, 15 Dec 2023 10:07:35 +0000 (18:07 +0800)
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>
CMakeLists.txt

index 4feb22c135e1811903eb6f1165e517a5187a7fa0..1364426067ce7e2ef461ab555fe481298c63d904 100644 (file)
@@ -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()