Changeset 6bfb1f5 in subsurface


Ignore:
Timestamp:
May 20, 2017, 12:20:48 PM (5 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
b1ccd2f
Parents:
f690a98
git-author:
Thiago Macieira <thiago@…> (05/19/17 15:13:16)
git-committer:
Dirk Hohndel <dirk@…> (05/20/17 12:20:48)
Message:

Adapt build.sh if qmake is already in PATH on a Mac

Some people (like me) have Qt elsewhere. So long as qmake is in PATH,
we should be able to support it.

Signed-off-by: Thiago Macieira <thiago@…>
Signed-off-by: Dirk Hohndel <dirk@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • scripts/build.sh

    rd82f8cb r6bfb1f5  
    175175        cd build
    176176        if [ $PLATFORM = Darwin ] ; then
    177                 if [ -d "$HOME/Qt/5.8" ] ; then
     177                # qmake in PATH?
     178                libdir=`qmake -query QT_INSTALL_LIBS`
     179                if [ $? -eq 0 ]; then
     180                        export CMAKE_PREFIX_PATH=$libdir/cmake
     181                elif [ -d "$HOME/Qt/5.8" ] ; then
    178182                        export CMAKE_PREFIX_PATH=~/Qt/5.8/clang_64/lib/cmake
    179183                elif [ -d "$HOME/Qt/5.7" ] ; then
Note: See TracChangeset for help on using the changeset viewer.