]> danny-edel.de - dspdfviewer.git/commitdiff
use brew --prefix instead of shell glob
authorDanny Edel <mail@danny-edel.de>
Wed, 18 May 2016 11:00:32 +0000 (13:00 +0200)
committerDanny Edel <mail@danny-edel.de>
Wed, 18 May 2016 11:00:32 +0000 (13:00 +0200)
_travis/configure

index 8e1d9172077d87151676d75c539c52c676598602..f0a6f779e107eeaa0a61cb46270556bce4b2456a 100755 (executable)
@@ -33,9 +33,8 @@ elif [ "$QT_VERSION" -eq 5 ] ; then
        if [ "$TRAVIS_OS_NAME" = "osx" ] ; then
                # on OSX/Homebrew, qt5 is not in default search path yet.
                #
-               # Use shell-glob to find the qt5 directory
-               # and pass it to cmake
-               QT5PATH=$(ls -d /usr/local/Cellar/qt5/5.*/ | head -n1 )
+               # Use brew to find the qt5 prefix and pass it to cmake.
+               QT5PATH=$(brew --prefix qt5)
                CMAKE_PARAMETERS+=" -DCMAKE_PREFIX_PATH=$QT5PATH"
        fi
 else