Changeset 875 for trunk/config/sys/Darwin-g++.gmk

Timestamp:

Oct 30, 2008, 5:49:28 PM (16 years ago)

Author:

garnier

Message:

try to be better

File:

• trunk/config/sys/Darwin-g++.gmk (modified) (4 diffs)

trunk/config/sys/Darwin-g++.gmk

@@ -3 +3 @@
 #                                 MacOS 10.3 gcc-3.3
 #                                 MacOS 10.4 gcc-4.0
+#                                 MacOS 10.5 gcc-4.0
 #
 # Original author: Helmut Burkhardt - CERN
 #       Revisions: Guy Barrand - LAL
 #                  Gabriele Cosmo - CERN
+#                  Laurent Garnier - LAL
 #
 ifeq ($(G4SYSTEM),Darwin-g++)
@@ -64 +66 @@
     OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
     ifeq ($(G4SYSTEM),Darwin-g++)
-          # It may be required to uncomment the following lines for building on MacOSX 10.5 "Leopard"
+          # the following lines are for building on MacOSX 10.5 "Leopard"
       OGLLIBS   := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo " -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
       endif
@@ -72 +74 @@
   endif
 
-  ifeq ($(QTHOME),/Library/Frameworks)
-    QT_VERSION := $(shell grep "QT_VERSION_STR" $(QTHOME)/QtCore.framework/Headers/qglobal.h | sed 's/.* \"\([0-9]\)\..*\"/\1/')
-  else
-    QT_VERSION := $(shell grep "QT_VERSION_STR" $(QTHOME)/include/qt/qglobal.h | sed 's/.* \"\([0-9]\)\..*\"/\1/')
+  ifndef QTMOC
+   ifeq ($(QTHOME),/Library/Frameworks)
+     QTMOC      := /usr/bin/moc
+   else
+     QTMOC      := $(QTHOME)/bin/moc
+   endif
   endif
+
+  QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' )
 
   ifndef QTFLAGS
@@ -85 +91 @@
     else
       QTFLAGS   := -I $(QTHOME)/include/Qt -I$(QTHOME)/include
-    endif
-  endif
-  ifndef QTMOC
-    ifeq ($(QT_VERSION),4)
-      QTMOC      := /usr/bin/moc
-    else
-      QTMOC      := $(QTHOME)/bin/moc
     endif
   endif