From: Wolfgang Bangerth Date: Fri, 11 Feb 2011 15:45:38 +0000 (+0000) Subject: Override qmake's default for XCode on Mac OS X. X-Git-Tag: v8.0.0~4360 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=721fb355f67ced5651b144c17e8eb6e0b63fe20e;p=dealii.git Override qmake's default for XCode on Mac OS X. git-svn-id: https://svn.dealii.org/trunk@23338 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/configure b/deal.II/configure index c55f440cc0..a1afa9ed76 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -13233,6 +13233,13 @@ fi + case "$target" in + *apple-darwin*) + QMAKE="$QMAKE -spec macx-g++" + ;; + esac + + DEAL_II_QT_VERSION="`($QMAKE --version 2>&1) | grep -i version | grep -i qt | perl -pi -e 's/.*(\d+)\.(\d+)\.(\d+).*/\1.\2/g;'`" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt version is >= 4.3" >&5 diff --git a/deal.II/configure.in b/deal.II/configure.in index 3b66982b3a..2fcc6e4a6a 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -706,6 +706,15 @@ AC_CHECK_PROG(QMAKE,qmake,qmake) if test -n "$QMAKE" ; then AC_PATH_PROG(QMAKE,$QMAKE) + dnl On Mac OS X, qmake's default is to generate XCode project files + dnl rather than Makefiles. Override this: + case "$target" in + *apple-darwin*) + QMAKE="$QMAKE -spec macx-g++" + ;; + esac + + dnl Verify that Qt version is at least 4.3. Only consider the major dnl and minor version number, don't care about the subminor DEAL_II_QT_VERSION="`($QMAKE --version 2>&1) | grep -i version | grep -i qt | perl -pi -e 's/.*(\d+)\.(\d+)\.(\d+).*/\1.\2/g;'`"