]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Override qmake's default for XCode on Mac OS X.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 11 Feb 2011 15:45:38 +0000 (15:45 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 11 Feb 2011 15:45:38 +0000 (15:45 +0000)
git-svn-id: https://svn.dealii.org/trunk@23338 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/configure
deal.II/configure.in

index c55f440cc02e77def481ea173f97c232ff6b5c74..a1afa9ed762e60dd2d42a1783a61eeece0aa7dec 100755 (executable)
 
 
 
+      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
index 3b66982b3a5d19216eacddd51cde292a79274030..2fcc6e4a6ad07dab100f3ff8dc471f8183fa8aac 100644 (file)
@@ -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;'`"

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.