From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 1 Nov 2016 20:39:51 +0000 (+0100)
Subject: travis: Try to work around a build issue with LDAP on OSX
X-Git-Tag: travis-deploy-test~268
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=2be361445e95238b9de13c337bacece3e2771d0d;hp=cfbd4daee17dbb3c4052d938bf33edd08711d728

travis: Try to work around a build issue with LDAP on OSX

Seems like the headers found in the OSX Frameworks are broken, so
try giving the include path explicitly.
---

diff --git a/.travis.yml b/.travis.yml
index 11f02ffd..5ce83c69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,9 +53,10 @@ script: |-
     if [[ "$TRAVIS_TAG" != "" && "$GH_TOKEN" != "" ]]
     then
       PATH=$PATH:/usr/local/opt/qt5/bin
-      cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -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 -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