From dcdf37a607ac1439bbaf91c55c5e20fccc1f5d75 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Wed, 7 Aug 2024 16:45:46 +0100 Subject: [PATCH] fixup! cmake: Build `bitcoind` executable Pass `-DBOOST_NO_CXX98_FUNCTION_BASE` to the header check only when applicable. We have to pass it if accepted; otherwise, the test header check may fail on some systems, such as macOS arm64 + Homebrew's boost@1.76. --- cmake/module/AddBoostIfNeeded.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/module/AddBoostIfNeeded.cmake b/cmake/module/AddBoostIfNeeded.cmake index ca8bcf16afb9f..89603ecd6155d 100644 --- a/cmake/module/AddBoostIfNeeded.cmake +++ b/cmake/module/AddBoostIfNeeded.cmake @@ -60,6 +60,8 @@ function(add_boost_if_needed) target_compile_definitions(Boost::headers INTERFACE BOOST_NO_CXX98_FUNCTION_BASE ) + else() + set(CMAKE_REQUIRED_DEFINITIONS) endif() if(BUILD_TESTS)