Changeset 758 for trunk/geant4
- Timestamp:
- Mar 19, 2008, 11:59:41 AM (17 years ago)
- Location:
- trunk/geant4/config
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/config/History
r689 r758 1 $Id: History,v 1.31 2 2008/01/15 11:14:58lgarnier Exp $1 $Id: History,v 1.317 2008/03/19 10:24:00 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 ---------------------------------------------------------- 18 18 19 15th January 2007, Laurent Garnier 20 - common.gmk : Added a function to autogenerate the moc files for Qt driver 21 - WIN32-VC : Added flags to build Qt driver on windows 19 19th March 2008, Laurent Garnier 20 - common.gmk : Changes for moc generation. When compiling G4UI driver 21 AFTER compiling G4UI QT driver, it does not remove the moc generated files 22 and try to compile theme again and failed. Corrected. 23 24 18th March 2008, Laurent Garnier 25 - common.gmk : Minor changes when compiling Qt 26 27 21st February 2008 Gabriele Cosmo (config-V09-01-01) 28 - Replaced g77 with gfortran for Linux-g++ and Linux-icc platforms. 29 30 15th February 2008 Laurent Garnier 31 - common.gmk: added ability to autogenerate moc files for Qt driver. 32 - WIN32-VC: added flags to build Qt driver on Windows. 33 - Darwin-g++, Linux-g++: improvements for autogeneration of MOC files for Qt. 22 34 23 35 15th January 2008 Gabriele Cosmo (config-V09-01-00) … … 60 72 - Added "incl" (Liege cascade) hadronic model module to binmake.gmk. 61 73 74 75 3th October 2007 Laurent Garnier 76 - Added setup for Qt in those files : 77 - config/G4UI_BUILD.gmk 78 - config/G4UI_USE.gmk 79 - config/G4VIS_BUILD.gmk 80 - config/G4VIS_USE.gmk 81 - config/interactivity.gmk 82 - config/sys/Darwin-g++.gmk 83 - config/sys/Linux-g++.gmk 84 62 85 16th August 2007 Gabriele Cosmo (config-V09-00-04) 63 86 - Corrected definition of OUT internal variable to allow for proper -
trunk/geant4/config/common.gmk
r726 r758 1 # $Id: common.gmk,v 1. 44 2008/01/15 11:14:58lgarnier Exp $1 # $Id: common.gmk,v 1.50 2008/03/19 10:55:47 lgarnier Exp $ 2 2 # ---------------------------------------------------------------- 3 3 # Common part of GNUmakefile for libraries. John Allison, 5/7/95. … … 5 5 # Libraries are created according to G4SYSTEM. G.Cosmo, 11/6/96. 6 6 # Introduced G4LIBDIR and G4TMPDIR. G.Cosmo, 23/6/98. 7 # Introduced Q T moc rule,L. Garnier 12/6/07.7 # Introduced Qt moc rule, L.Garnier 15/2/08. 8 8 9 9 ifndef G4LIBDIR … … 14 14 moc_inc = $(shell grep -l "Q_OBJECT" include/*.hh ) 15 15 moc_files := $(patsubst include/%.hh, src/%_moc.cc, $(moc_inc)) 16 sources := $(wildcard src/*.cc) 17 sources += $(moc_files) 16 17 18 ifeq ($(G4INTY_BUILD_QT),) 19 # not so beautiful. In therory we should only remove theses files from sources 20 sources := $(shell rm -f $(moc_files)) 21 sources := $(wildcard src/*.cc) 22 endif 23 24 ifneq ($(G4INTY_BUILD_QT),) 25 sources := $(wildcard src/*.cc) 26 sources += $(moc_files) 27 endif 28 29 18 30 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources)) 19 31 dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources)) … … 66 78 ############################################################################### 67 79 # 68 # Actual moc files for qt files80 # Actual moc files for Qt files 69 81 # 70 82 # moc sources and headers: used for Qt signal/slot 71 83 # - all headers which use signals/slots have the macro "Q_OBJECT" present 72 # in the class definitions; these all need to be processed by the73 # "meta object compiler (moc)" which generates extra source code to74 # implement the signal/slots, i.e., if "foo.h" contains the token "Q_OBJECT"75 # it will be used by moc to generate the file "foo_moc.cpp" (the _moc. is84 # in the class definitions; these all need to be processed by the 85 # "meta object compiler (moc)" which generates extra source code to 86 # implement the signal/slots, i.e., if "foo.h" contains the token "Q_OBJECT" 87 # it will be used by moc to generate the file "foo_moc.cpp" (the _moc. is 76 88 # just an arbitrary extension to make it easier to identify sources 77 89 # generated by moc). 78 90 91 ifneq ($(G4INTY_BUILD_QT),) 79 92 src/%_moc.cc: include/%.hh 80 93 @echo Making moc file for $< ... … … 83 96 else $(QTMOC) $(MOC_MACRO) -o $@ $<; \ 84 97 fi; 98 endif 99 85 100 86 101 ############################################################################### -
trunk/geant4/config/interactivity.gmk
r486 r758 22 22 LOAD_GL = 1 23 23 INTYLIBS += $(OIVLIBS) 24 endif 25 26 ########################### Qt ############################### 27 # Should be before X11. 28 ifdef INC_QT 29 CPPFLAGS += $(QTFLAGS) 30 endif 31 ifdef LOAD_QT 32 INTYLIBS += $(QTLIBS) 24 33 endif 25 34 … … 56 65 endif 57 66 67 58 68 ifdef INC_X11 59 69 CPPFLAGS += $(X11FLAGS) … … 63 73 endif 64 74 65 ########################### Qt ###################66 67 ifdef INC_QT68 CPPFLAGS += $(QTFLAGS)69 endif70 ifdef LOAD_QT71 INTYLIBS += $(QTLIBS)72 endif73 75 74 76 ########################### and finally... ####################### -
trunk/geant4/config/sys/Darwin-g++.gmk
r726 r758 47 47 # XMLIBS := -L/usr/X11R6/lib -lXm -lXpm ##### some installations. 48 48 endif 49 ifndef QTHOME50 QTHOME := /sw51 endif52 ifndef QTFLAGS53 QTFLAGS := -I$(QTHOME)/include/Qt -I$(QTHOME)/include54 endif55 ifndef QTMOC56 QTMOC := $(QTHOME)/bin/moc57 endif58 ifndef QTLIBS59 QT3LIBS := -L$(QTHOME)/lib -lqt -lqui60 QT4LIBS := -F$(QTHOME)/lib -framework QtCore -framework QtGui61 QT4LIBS += -framework QtOpenGL -framework QtSql -framework QtXml62 QTLIBS := $(shell test -f $(QTHOME)/lib/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))63 endif64 49 ifndef XAWFLAGS 65 50 XAWFLAGS := -I/sw/include … … 83 68 # /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib 84 69 endif 70 ifndef QTHOME 71 QTHOME := /sw 72 endif 73 ifndef QTFLAGS 74 QTFLAGS := -I$(QTHOME)/include/Qt -I$(QTHOME)/include 75 endif 76 ifndef QTMOC 77 QTMOC := $(QTHOME)/bin/moc 78 endif 79 ifndef QTLIBS 80 QT3LIBS := -L$(QTHOME)/lib -lqt -lqui 81 QT4LIBS := -F$(QTHOME)/lib -framework QtCore -framework QtGui 82 QT4LIBS += -framework QtOpenGL -framework QtSql -framework QtXml 83 QTLIBS := $(shell test -f $(QTHOME)/lib/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS)) 84 endif 85 85 86 86 define build-granular-shared-lib -
trunk/geant4/config/sys/Linux-g++.gmk
r726 r758 38 38 G4RUNPATHOPTION := -Wl,-rpath 39 39 CC := gcc 40 FC := g 7740 FC := gfortran 41 41 FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore 42 42 FCLIBS := -lg2c -lnsl … … 56 56 endif 57 57 ifndef QTHOME 58 QTHOME := /usr/local/Qt58 QTHOME := /usr/local/Qt 59 59 endif 60 60 ifndef QTFLAGS 61 QTFLAGS := -I$(QTHOME)/include/Qt62 QTFLAGS += -I$(QTHOME)/include61 QTFLAGS := -I$(QTHOME)/include/Qt 62 QTFLAGS += -I$(QTHOME)/include 63 63 endif 64 64 ifndef QTMOC 65 QTMOC 65 QTMOC := $(QTHOME)/bin/moc 66 66 endif 67 67 ifndef QTLIBS -
trunk/geant4/config/sys/Linux-icc.gmk
r483 r758 28 28 G4RUNPATHOPTION := -Wl,-rpath -Wl, 29 29 CC := gcc 30 FC := g 7730 FC := gfortran 31 31 FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore 32 32 FCLIBS := -lg2c -lnsl -
trunk/geant4/config/sys/WIN32-VC.gmk
r726 r758 36 36 endif 37 37 ifndef QTHOME 38 QTHOME := /usr38 QTHOME := /usr 39 39 endif 40 40 ifndef QTFLAGS … … 42 42 endif 43 43 ifndef QTMOC 44 QTMOC 44 QTMOC := $(QTHOME)/bin/moc 45 45 endif 46 46 ifndef QTLIBS 47 QT3LIBS := -L$(QTHOME)/lib -lqt-mt 48 QT4LIBS := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib 49 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 50 QTLIBS := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo $(QT4LIBS) || echo $(QT3LIBS)) 47 QT3LIBS := -L$(QTHOME)/lib -lqt-mt 48 QT4LIBS := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib 49 QTLIBS := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo $(QT4LIBS) || echo $(QT3LIBS)) 51 50 endif 52 53 51 54 52 #
Note: See TracChangeset
for help on using the changeset viewer.