mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-25 20:48:52 +03:00
Build boost with C++14
This commit is contained in:
parent
4a30eb30b3
commit
cbff9c6914
2 changed files with 12 additions and 1 deletions
|
@ -2,6 +2,17 @@
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
|
if [ $TRAVIS_OS_NAME == linux ]; then
|
||||||
|
export CC=${C_COMPILER}
|
||||||
|
export CXX=${CXX_COMPILER}
|
||||||
|
|
||||||
|
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/${C_COMPILER} 10
|
||||||
|
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/${CXX_COMPILER} 10
|
||||||
|
|
||||||
|
sudo update-alternatives --set gcc "/usr/bin/${C_COMPILER}"
|
||||||
|
sudo update-alternatives --set g++ "/usr/bin/${CXX_COMPILER}"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ $TRAVIS_OS_NAME == linux ]; then
|
if [ $TRAVIS_OS_NAME == linux ]; then
|
||||||
source /opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh || true;
|
source /opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh || true;
|
||||||
fi
|
fi
|
||||||
|
|
2
deps/cmake/Boost.cmake
vendored
2
deps/cmake/Boost.cmake
vendored
|
@ -16,7 +16,7 @@ ExternalProject_Add(
|
||||||
CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/boost/bootstrap.sh
|
CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/boost/bootstrap.sh
|
||||||
--with-libraries=random,thread,system,iostreams,atomic,chrono,date_time,regex
|
--with-libraries=random,thread,system,iostreams,atomic,chrono,date_time,regex
|
||||||
--prefix=${DEPS_INSTALL_DIR}
|
--prefix=${DEPS_INSTALL_DIR}
|
||||||
BUILD_COMMAND ${DEPS_BUILD_DIR}/boost/b2 -d0 variant=release link=static threading=multi --layout=system
|
BUILD_COMMAND ${DEPS_BUILD_DIR}/boost/b2 -d0 cxxstd=14 variant=release link=static threading=multi --layout=system
|
||||||
INSTALL_COMMAND ${DEPS_BUILD_DIR}/boost/b2 -d0 install
|
INSTALL_COMMAND ${DEPS_BUILD_DIR}/boost/b2 -d0 install
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue