Changeset 758


Ignore:
Timestamp:
Mar 19, 2008, 11:59:41 AM (16 years ago)
Author:
garnier
Message:

QT moc remove before compiling

Location:
trunk/geant4/config
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/config/History

    r689 r758  
    1 $Id: History,v 1.312 2008/01/15 11:14:58 lgarnier Exp $
     1$Id: History,v 1.317 2008/03/19 10:24:00 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     ----------------------------------------------------------
    1818
    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
     1919th 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
     2418th March 2008, Laurent Garnier
     25 - common.gmk : Minor changes when compiling Qt
     26
     2721st February 2008  Gabriele Cosmo (config-V09-01-01)
     28- Replaced g77 with gfortran for Linux-g++ and Linux-icc platforms.
     29
     3015th 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.
    2234
    233515th January 2008  Gabriele Cosmo (config-V09-01-00)
    … …  
    6072- Added "incl" (Liege cascade) hadronic model module to binmake.gmk.
    6173 
     74 
     753th 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
    628516th August 2007  Gabriele Cosmo (config-V09-00-04)
    6386- 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:58 lgarnier Exp $
     1# $Id: common.gmk,v 1.50 2008/03/19 10:55:47 lgarnier Exp $
    22# ----------------------------------------------------------------
    33# Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
    … …  
    55# Libraries are created according to G4SYSTEM. G.Cosmo, 11/6/96.
    66# Introduced G4LIBDIR and G4TMPDIR. G.Cosmo, 23/6/98.
    7 # Introduced QT moc rule,L. Garnier 12/6/07.
     7# Introduced Qt moc rule, L.Garnier 15/2/08.
    88
    99ifndef G4LIBDIR
    … …  
    1414moc_inc = $(shell grep -l "Q_OBJECT" include/*.hh )
    1515moc_files := $(patsubst include/%.hh, src/%_moc.cc, $(moc_inc))
    16 sources := $(wildcard src/*.cc)
    17 sources += $(moc_files)
     16
     17
     18ifeq ($(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)
     22endif
     23
     24ifneq ($(G4INTY_BUILD_QT),)
     25  sources := $(wildcard src/*.cc)
     26  sources += $(moc_files)
     27endif
     28
     29
    1830objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
    1931dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
    … …  
    6678###############################################################################
    6779#
    68 # Actual moc files for qt files
     80# Actual moc files for Qt files
    6981#
    7082# moc sources and headers: used for Qt signal/slot
    7183# - all headers which use signals/slots have the macro "Q_OBJECT" present
    72 #  in the class definitions; these all need to be processed by the
    73 #  "meta object compiler (moc)" which generates extra source code to
    74 #  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. is
     84#   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
    7688#   just an arbitrary extension to make it easier to identify sources
    7789#   generated by moc).
    7890
     91ifneq ($(G4INTY_BUILD_QT),)
    7992src/%_moc.cc: include/%.hh
    8093        @echo Making moc file for $< ...
    … …  
    8396        else $(QTMOC) $(MOC_MACRO) -o $@ $<; \
    8497        fi;
     98endif
     99
    85100
    86101###############################################################################

  • trunk/geant4/config/interactivity.gmk

    r486 r758  
    2222  LOAD_GL  = 1
    2323  INTYLIBS += $(OIVLIBS)
     24endif
     25
     26########################### Qt ###############################
     27# Should be before X11.
     28ifdef INC_QT
     29  CPPFLAGS += $(QTFLAGS)
     30endif
     31ifdef LOAD_QT
     32  INTYLIBS += $(QTLIBS)
    2433endif
    2534
    … …  
    5665endif
    5766
     67
    5868ifdef INC_X11
    5969  CPPFLAGS += $(X11FLAGS)
    … …  
    6373endif
    6474
    65 ########################### Qt ###################
    66 
    67 ifdef INC_QT
    68   CPPFLAGS += $(QTFLAGS)
    69 endif
    70 ifdef LOAD_QT
    71   INTYLIBS += $(QTLIBS)
    72 endif
    7375
    7476########################### and finally... #######################

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

    r726 r758  
    4747#   XMLIBS    := -L/usr/X11R6/lib -lXm -lXpm   ##### some installations.
    4848  endif
    49   ifndef QTHOME
    50     QTHOME  := /sw
    51   endif
    52   ifndef QTFLAGS
    53     QTFLAGS   := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
    54   endif
    55   ifndef QTMOC
    56     QTMOC       := $(QTHOME)/bin/moc
    57   endif
    58   ifndef QTLIBS
    59     QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
    60     QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
    61     QT4LIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
    62     QTLIBS     := $(shell test -f $(QTHOME)/lib/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
    63   endif
    6449  ifndef XAWFLAGS
    6550    XAWFLAGS   := -I/sw/include
    … …  
    8368#                 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
    8469  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
    8585
    8686  define build-granular-shared-lib

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

    r726 r758  
    3838  G4RUNPATHOPTION := -Wl,-rpath
    3939  CC := gcc
    40   FC := g77
     40  FC := gfortran
    4141  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
    4242  FCLIBS := -lg2c -lnsl
    … …  
    5656  endif
    5757  ifndef QTHOME
    58     QTHOME  := /usr/local/Qt
     58    QTHOME     := /usr/local/Qt
    5959  endif
    6060  ifndef QTFLAGS
    61     QTFLAGS   := -I$(QTHOME)/include/Qt
    62     QTFLAGS   += -I$(QTHOME)/include
     61    QTFLAGS    := -I$(QTHOME)/include/Qt
     62    QTFLAGS    += -I$(QTHOME)/include
    6363  endif
    6464  ifndef QTMOC
    65     QTMOC       := $(QTHOME)/bin/moc
     65    QTMOC      := $(QTHOME)/bin/moc
    6666  endif
    6767  ifndef QTLIBS

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

    r483 r758  
    2828  G4RUNPATHOPTION := -Wl,-rpath -Wl,
    2929  CC := gcc
    30   FC := g77
     30  FC := gfortran
    3131  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
    3232  FCLIBS := -lg2c -lnsl

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

    r726 r758  
    3636  endif
    3737  ifndef QTHOME
    38     QTHOME  := /usr
     38    QTHOME    := /usr
    3939  endif
    4040  ifndef QTFLAGS
    … …  
    4242  endif
    4343  ifndef QTMOC
    44     QTMOC       := $(QTHOME)/bin/moc
     44    QTMOC     := $(QTHOME)/bin/moc
    4545  endif
    4646  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))
    5150  endif
    52 
    5351
    5452#
Note: See TracChangeset for help on using the changeset viewer.