X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=.travis.yml;h=5ce83c6932fd95fd4a83ae06319cde0e44ec897c;hp=bc92eacc7f756a917128e0238acdeec72334abda;hb=30fa961d1aca319b52071ad9d6e4527ea2638fb7;hpb=644305459a762c910c808bd6b0b64143da275228

diff --git a/.travis.yml b/.travis.yml
index bc92eacc..5ce83c69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,17 +45,18 @@ script: |-
   cd build
   if [ "$TRAVIS_OS_NAME" == "linux" ]
   then
-    if [ "$QT_VERSION" = "qt4" ]; then cmake ..; fi
-    if [ "$QT_VERSION" = "qt5" ]; then cmake -DUSE_QT5=ON ..; fi
+    if [ "$QT_VERSION" = "qt4" ]; then cmake -DUSE_QT4=ON ..; fi
+    if [ "$QT_VERSION" = "qt5" ]; then cmake ..; fi
     make
   elif [ "$TRAVIS_OS_NAME" == "osx" ]
   then
     if [[ "$TRAVIS_TAG" != "" && "$GH_TOKEN" != "" ]]
     then
       PATH=$PATH:/usr/local/opt/qt5/bin
-      cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -DUSE_QT5=ON -DWANT_CORE=ON -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DDEPLOY=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5
+      # 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/
     else
-      cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -DUSE_QT5=ON -DWANT_CORE=ON -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5
+      cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DLDAP_INCLUDE_DIR=/usr/include/
     fi
     ninja install
   fi