d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-26 04:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build mtxclient with Bundled Boost (#350)

Browse source 
* 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.
This commit is contained in:
Cameron Conn 2018-06-22 07:22:10 -05:00 committed by mujx
parent 1a3a9c836c
commit 7051d8025f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
deps/cmake/MatrixClient.cmake vendored
View file

@ -8,6 +8,11 @@ if(APPLE)
set(PLATFORM_FLAGS "-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl") set(PLATFORM_FLAGS "-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl")
endif() 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( ExternalProject_Add(
MatrixClient MatrixClient
@ -23,6 +28,7 @@ ExternalProject_Add(
-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_TESTS=OFF
-DBUILD_LIB_EXAMPLES=OFF -DBUILD_LIB_EXAMPLES=OFF
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
${BOOST_BUNDLE_ROOT}
${PLATFORM_FLAGS} ${PLATFORM_FLAGS}
${DEPS_BUILD_DIR}/mtxclient ${DEPS_BUILD_DIR}/mtxclient
BUILD_COMMAND BUILD_COMMAND