From c94486cd3c33b0b9c8ab54a293706f933204d713 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Wed, 30 Mar 2022 10:08:45 +0200 Subject: [PATCH 1/3] Make boost more independent of the toolchain it was built from --- deps/Boost/Boost.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/Boost/Boost.cmake b/deps/Boost/Boost.cmake index 15792d5a75..d219736fec 100644 --- a/deps/Boost/Boost.cmake +++ b/deps/Boost/Boost.cmake @@ -107,7 +107,7 @@ set(_build_cmd ${_build_cmd} ${_boost_flags} -j${NPROC} ${_libs} - --layout=versioned + --layout=system #versioned --debug-configuration toolset=${_boost_toolset} address-model=${_bits} From d5e55a3c62d74a21aa33a6006a1114bbd77bab7d Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Wed, 30 Mar 2022 10:33:58 +0200 Subject: [PATCH 2/3] Fix boost build on arm mac --- deps/Boost/Boost.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deps/Boost/Boost.cmake b/deps/Boost/Boost.cmake index d219736fec..c6a2480864 100644 --- a/deps/Boost/Boost.cmake +++ b/deps/Boost/Boost.cmake @@ -37,6 +37,8 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") if (WIN32) set(_boost_toolset "clang-win") + elseif (APPLE) + set(_boost_toolset "clang") else() set(_boost_toolset "clang") endif() From 674f1683a1bcd4b0e5bb3978236df3a17fa981fc Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Wed, 30 Mar 2022 12:47:13 +0200 Subject: [PATCH 3/3] Fix boost build on windows --- deps/Boost/Boost.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deps/Boost/Boost.cmake b/deps/Boost/Boost.cmake index c6a2480864..d33e891f6a 100644 --- a/deps/Boost/Boost.cmake +++ b/deps/Boost/Boost.cmake @@ -105,11 +105,16 @@ if (NOT _boost_variants) set(_boost_variants release) endif() +set(_boost_layout system) +if (MSVC) + set(_boost_layout versioned) +endif () + set(_build_cmd ${_build_cmd} ${_boost_flags} -j${NPROC} ${_libs} - --layout=system #versioned + --layout=${_boost_layout} --debug-configuration toolset=${_boost_toolset} address-model=${_bits}