summary refs log tree commit diff
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-08-08 14:43:01 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-08-08 14:43:01 +0300
commit22161b502ece16c8fd6e27495e41f2bcfafae2ab (patch)
tree908f72d6e9d44e0c5cdd7665c26aa5d74c4653cd
parentRemove dash from version string when building outside of git (diff)
downloadnheko-22161b502ece16c8fd6e27495e41f2bcfafae2ab.tar.xz
Don't use bundled spdlog
-rwxr-xr-x.ci/script.sh4
-rw-r--r--.travis.yml5
2 files changed, 1 insertions, 8 deletions
diff --git a/.ci/script.sh b/.ci/script.sh

index 6d873414..309e5915 100755 --- a/.ci/script.sh +++ b/.ci/script.sh
@@ -11,9 +11,7 @@ if [ $TRAVIS_OS_NAME == osx ]; then fi # Build & install dependencies -cmake -GNinja -Hdeps -B.deps \ - -DUSE_BUNDLED_BOOST=${USE_BUNDLED_BOOST} \ - -DUSE_BUNDLED_SPDLOG=${USE_BUNDLED_SPDLOG} +cmake -GNinja -Hdeps -B.deps -DUSE_BUNDLED_BOOST=${USE_BUNDLED_BOOST} cmake --build .deps # Build nheko diff --git a/.travis.yml b/.travis.yml
index 89736898..e6c6d443 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -15,7 +15,6 @@ matrix: env: - DEPLOYMENT=1 - USE_BUNDLED_BOOST=0 - - USE_BUNDLED_SPDLOG=0 - os: linux compiler: gcc env: @@ -25,7 +24,6 @@ matrix: - QT_PKG=510 - DEPLOYMENT=1 - USE_BUNDLED_BOOST=1 - - USE_BUNDLED_SPDLOG=1 addons: apt: sources: ["ubuntu-toolchain-r-test"] @@ -38,7 +36,6 @@ matrix: - QT_VERSION="-5.10.1" - QT_PKG=510 - USE_BUNDLED_BOOST=1 - - USE_BUNDLED_SPDLOG=1 addons: apt: sources: ["ubuntu-toolchain-r-test"] @@ -51,7 +48,6 @@ matrix: - QT_VERSION=571 - QT_PKG=57 - USE_BUNDLED_BOOST=1 - - USE_BUNDLED_SPDLOG=1 addons: apt: sources: ["ubuntu-toolchain-r-test"] @@ -64,7 +60,6 @@ matrix: - QT_VERSION=592 - QT_PKG=59 - USE_BUNDLED_BOOST=1 - - USE_BUNDLED_SPDLOG=1 addons: apt: sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"]