projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logger: Make output to syslog nicer
[quassel.git]
/
.travis.yml
diff --git
a/.travis.yml
b/.travis.yml
index
5ce83c6
..
42fae1f
100644
(file)
--- a/
.travis.yml
+++ b/
.travis.yml
@@
-1,6
+1,5
@@
os:
- linux
os:
- linux
- - osx
sudo: required
dist: trusty
sudo: required
dist: trusty
@@
-17,13
+16,13
@@
env:
- QT_VERSION=qt5
matrix:
- QT_VERSION=qt5
matrix:
+ include:
+ - os: osx
+ compiler: gcc
+ env: QT_VERSION=qt5
exclude:
- compiler: clang
env: QT_VERSION=qt4
exclude:
- compiler: clang
env: QT_VERSION=qt4
- - os: osx
- compiler: clang
- - os: osx
- env: QT_VERSION=qt4
install: |-
if [ "$TRAVIS_OS_NAME" == "linux" ]
install: |-
if [ "$TRAVIS_OS_NAME" == "linux" ]
@@
-50,13
+49,12
@@
script: |-
make
elif [ "$TRAVIS_OS_NAME" == "osx" ]
then
make
elif [ "$TRAVIS_OS_NAME" == "osx" ]
then
+ PATH=$PATH:/usr/local/opt/qt5/bin
if [[ "$TRAVIS_TAG" != "" && "$GH_TOKEN" != "" ]]
then
if [[ "$TRAVIS_TAG" != "" && "$GH_TOKEN" != "" ]]
then
- PATH=$PATH:/usr/local/opt/qt5/bin
- # The LDAP headers found in OSX Frameworks seem to be broken
- cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -DDEPLOY=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DLDAP_INCLUDE_DIR=/usr/include/
+ cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -DDEPLOY=ON
else
else
- cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release
-DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DLDAP_INCLUDE_DIR=/usr/include/
+ cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release
fi
ninja install
fi
fi
ninja install
fi