diff options
| author | Cameron Conn <camconn@users.noreply.github.com> | 2018-06-22 07:22:10 -0500 |
|---|---|---|
| committer | mujx <mujx@users.noreply.github.com> | 2018-06-22 15:22:10 +0300 |
| commit | 7051d8025f361f473b69525bddbf7bb1832c70b3 (patch) | |
| tree | 1e5afc3fe099f053cf26047485d3fd235ddd714c /deps | |
| parent | i18n: Add Polish translation (#349) (diff) | |
| download | nheko-7051d8025f361f473b69525bddbf7bb1832c70b3.tar.xz | |
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.
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/cmake/MatrixClient.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/deps/cmake/MatrixClient.cmake b/deps/cmake/MatrixClient.cmake index d8dd48c7..cf26f35d 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 |