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

Don't use bundled spdlog

Browse source
This commit is contained in:
Konstantinos Sideris 2018-08-08 14:43:01 +03:00
parent 04e4776886
commit 22161b502e
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.ci/script.sh
View file

@ -11,9 +11,7 @@ if [ $TRAVIS_OS_NAME == osx ]; then
fi fi
# Build & install dependencies # Build & install dependencies
cmake -GNinja -Hdeps -B.deps \ cmake -GNinja -Hdeps -B.deps -DUSE_BUNDLED_BOOST=${USE_BUNDLED_BOOST}
-DUSE_BUNDLED_BOOST=${USE_BUNDLED_BOOST} \
-DUSE_BUNDLED_SPDLOG=${USE_BUNDLED_SPDLOG}
cmake --build .deps cmake --build .deps
# Build nheko # Build nheko

5
.travis.yml
View file

@ -15,7 +15,6 @@ matrix:
env: env:
- DEPLOYMENT=1 - DEPLOYMENT=1
- USE_BUNDLED_BOOST=0 - USE_BUNDLED_BOOST=0
- USE_BUNDLED_SPDLOG=0
- os: linux - os: linux
compiler: gcc compiler: gcc
env: env:
@ -25,7 +24,6 @@ matrix:
- QT_PKG=510 - QT_PKG=510
- DEPLOYMENT=1 - DEPLOYMENT=1
- USE_BUNDLED_BOOST=1 - USE_BUNDLED_BOOST=1
- USE_BUNDLED_SPDLOG=1
addons: addons:
apt: apt:
sources: ["ubuntu-toolchain-r-test"] sources: ["ubuntu-toolchain-r-test"]
@ -38,7 +36,6 @@ matrix:
- QT_VERSION="-5.10.1" - QT_VERSION="-5.10.1"
- QT_PKG=510 - QT_PKG=510
- USE_BUNDLED_BOOST=1 - USE_BUNDLED_BOOST=1
- USE_BUNDLED_SPDLOG=1
addons: addons:
apt: apt:
sources: ["ubuntu-toolchain-r-test"] sources: ["ubuntu-toolchain-r-test"]
@ -51,7 +48,6 @@ matrix:
- QT_VERSION=571 - QT_VERSION=571
- QT_PKG=57 - QT_PKG=57
- USE_BUNDLED_BOOST=1 - USE_BUNDLED_BOOST=1
- USE_BUNDLED_SPDLOG=1
addons: addons:
apt: apt:
sources: ["ubuntu-toolchain-r-test"] sources: ["ubuntu-toolchain-r-test"]
@ -64,7 +60,6 @@ matrix:
- QT_VERSION=592 - QT_VERSION=592
- QT_PKG=59 - QT_PKG=59
- USE_BUNDLED_BOOST=1 - USE_BUNDLED_BOOST=1
- USE_BUNDLED_SPDLOG=1
addons: addons:
apt: apt:
sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"]