Skip to content
Snippets Groups Projects
Commit 7051d802 authored by Cameron Conn's avatar Cameron Conn Committed by mujx
Browse files

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.
parent 1a3a9c83
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment