Changeset 758 for trunk/geant4/config/sys

Timestamp:

Mar 19, 2008, 11:59:41 AM (18 years ago)

Author:

garnier

Message:

QT moc remove before compiling

Location:

trunk/geant4/config/sys

Files:

• Darwin-g++.gmk (modified) (2 diffs)
• Linux-g++.gmk (modified) (2 diffs)
• Linux-icc.gmk (modified) (1 diff)
• WIN32-VC.gmk (modified) (2 diffs)

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

@@ -47 +47 @@
 #   XMLIBS    := -L/usr/X11R6/lib -lXm -lXpm   ##### some installations.
   endif
-  ifndef QTHOME
-    QTHOME  := /sw
-  endif
-  ifndef QTFLAGS
-    QTFLAGS   := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
-  endif
-  ifndef QTMOC
-    QTMOC       := $(QTHOME)/bin/moc
-  endif
-  ifndef QTLIBS
-    QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
-    QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
-    QT4LIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
-    QTLIBS     := $(shell test -f $(QTHOME)/lib/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
-  endif
   ifndef XAWFLAGS
     XAWFLAGS   := -I/sw/include
@@ -83 +68 @@
 #                 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
   endif
+  ifndef QTHOME
+    QTHOME     := /sw
+  endif
+  ifndef QTFLAGS
+    QTFLAGS    := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
+  endif
+  ifndef QTMOC
+    QTMOC      := $(QTHOME)/bin/moc
+  endif
+  ifndef QTLIBS
+    QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
+    QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
+    QT4LIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
+    QTLIBS     := $(shell test -f $(QTHOME)/lib/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
+  endif
 
   define build-granular-shared-lib

trunk/geant4/config/sys/Linux-g++.gmk

@@ -38 +38 @@
   G4RUNPATHOPTION := -Wl,-rpath 
   CC := gcc
-  FC := g77
+  FC := gfortran
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   FCLIBS := -lg2c -lnsl
@@ -56 +56 @@
   endif
   ifndef QTHOME
-    QTHOME  := /usr/local/Qt
+    QTHOME     := /usr/local/Qt
   endif
   ifndef QTFLAGS
-    QTFLAGS   := -I$(QTHOME)/include/Qt
-    QTFLAGS   += -I$(QTHOME)/include
+    QTFLAGS    := -I$(QTHOME)/include/Qt
+    QTFLAGS    += -I$(QTHOME)/include
   endif
   ifndef QTMOC
-    QTMOC       := $(QTHOME)/bin/moc
+    QTMOC      := $(QTHOME)/bin/moc
   endif
   ifndef QTLIBS

trunk/geant4/config/sys/Linux-icc.gmk

@@ -28 +28 @@
   G4RUNPATHOPTION := -Wl,-rpath -Wl,
   CC := gcc
-  FC := g77
+  FC := gfortran
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   FCLIBS := -lg2c -lnsl

trunk/geant4/config/sys/WIN32-VC.gmk

@@ -36 +36 @@
   endif
   ifndef QTHOME
-    QTHOME  := /usr
+    QTHOME    := /usr
   endif
   ifndef QTFLAGS
@@ -42 +42 @@
   endif
   ifndef QTMOC
-    QTMOC       := $(QTHOME)/bin/moc
+    QTMOC     := $(QTHOME)/bin/moc
   endif
   ifndef QTLIBS
-    QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
-    QT4LIBS    := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib
-    QT4LIBS    += -lG4baryons -lG4biasing -lG4bosons -lG4brep -lG4csg -lG4cuts -lG4decay -lG4detector -lG4detutils -lG4digits -lG4emhighenergy -lG4emlowenergy -lG4empolar -lG4emstandard -lG4emutils -lG4error_propagation -lG4event -lG4geombias -lG4geomBoolean -lG4geomdivision -lG4geometrymng -lG4gflash -lG4globman -lG4graphics_reps -lG4hadronic_ablation -lG4hadronic_abrasion -lG4hadronic_bert_cascade -lG4hadronic_binary -lG4hadronic_body_ci -lG4hadronic_coherent_elastic -lG4hadronic_deex_evaporation -lG4hadronic_deex_fermi_breakup -lG4hadronic_deex_fission -lG4hadronic_deex_gem_evaporation -lG4hadronic_deex_handler -lG4hadronic_deex_management -lG4hadronic_deex_multifragmentation -lG4hadronic_deex_photon_evaporation -lG4hadronic_deex_util -lG4hadronic_em_dissociation -lG4hadronic_HE -lG4hadronic_hetcpp_evaporation -lG4hadronic_hetcpp_utils -lG4hadronic_interface_ci -lG4hadronic_iso -lG4hadronic_LE -lG4hadronic_leading_particle -lG4hadronic_mgt -lG4hadronic_proc -lG4hadronic_qgstring -lG4hadronic_radioactivedecay -lG4hadronic_stop -lG4hadronic_util -lG4hadronic_xsect -lG4had_im_r_matrix -lG4had_lll_fis -lG4had_mod_man -lG4had_mod_util -lG4had_muon_nuclear -lG4had_neu_hp -lG4had_preequ_exciton -lG4had_string_diff -lG4had_string_frag -lG4had_string_man -lG4had_theo_max -lG4hepnumerics -lG4hits -lG4intercoms -lG4ions -lG4leptons -lG4magneticfield -lG4materials -lG4mesons -lG4modeling -lG4muons -lG4navigation -lG4OpenGL -lG4optical -lG4parameterisation -lG4partman -lG4partutils -lG4persistency -lG4phys_builders -lG4phys_lists -lG4procman -lG4RayTracer -lG4readout -lG4run -lG4scoring -lG4shortlived -lG4specsolids -lG4track -lG4tracking -lG4transportation -lG4Tree -lG4UIbasic -lG4UIcommon -lG4UIGAG -lG4visHepRep -lG4visXXX -lG4vis_management -lG4volumes -lG4VRML -lG4xrays
-    QTLIBS     := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo $(QT4LIBS) || echo $(QT3LIBS))
+    QT3LIBS   := -L$(QTHOME)/lib -lqt-mt
+    QT4LIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib
+    QTLIBS    := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo $(QT4LIBS) || echo $(QT3LIBS))
   endif
-
 
 #