From 7051d8025f361f473b69525bddbf7bb1832c70b3 Mon Sep 17 00:00:00 2001 From: Cameron Conn Date: Fri, 22 Jun 2018 07:22:10 -0500 Subject: [PATCH] Build mtxclient with Bundled Boost (#350) * Build mtxclient with bundled Boost if requested. This commit ensures that mtxclient is built with the bundled version of Boost instead of a possibly-outdated system version when using USE_BUNDLED_BOOST. This resolves issue mujx/nheko#338. --- deps/cmake/MatrixClient.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deps/cmake/MatrixClient.cmake b/deps/cmake/MatrixClient.cmake index d8dd48c..cf26f35 100644 --- a/deps/cmake/MatrixClient.cmake +++ b/deps/cmake/MatrixClient.cmake @@ -8,6 +8,11 @@ if(APPLE) set(PLATFORM_FLAGS "-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl") endif() +# Force to build with the bundled version of Boost. This is necessary because +# if an outdated version of Boost is installed, then CMake will grab that +# instead of the bundled version of Boost, like we wanted. +set(BOOST_BUNDLE_ROOT "-DBOOST_ROOT=${DEPS_BUILD_DIR}/boost") + ExternalProject_Add( MatrixClient @@ -23,6 +28,7 @@ ExternalProject_Add( -DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + ${BOOST_BUNDLE_ROOT} ${PLATFORM_FLAGS} ${DEPS_BUILD_DIR}/mtxclient BUILD_COMMAND