From d624578670b35068c1c01d57361ad27aa7b95445 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 27 Feb 2018 12:21:29 +0100 Subject: Configure flatbuffers to build shared libs (+ attempt at multi-branch builds) --- .travis.yml | 3 +++ .travis/install-flatbuffers.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 87dbdfce..030efe53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,9 @@ addons: - libxapian-dev git: depth: 1 +branches: + except: + - gh-pages before_install: - source /opt/qt59/bin/qt59-env.sh diff --git a/.travis/install-flatbuffers.sh b/.travis/install-flatbuffers.sh index f97248c7..1ff8fcc2 100755 --- a/.travis/install-flatbuffers.sh +++ b/.travis/install-flatbuffers.sh @@ -6,7 +6,7 @@ tar xvfa /tmp/flatbuffers.tar.gz cd flatbuffers-1.8.0 mkdir build cd build -cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=/usr +cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=/usr -DFLATBUFFERS_BUILD_SHAREDLIB=ON ninja && sudo ninja install cd rm -rf /tmp/flatbuffers.tar.gz /tmp/flatbuffers-1.8.0 -- cgit v1.2.3