Changeset 606 for trunk/geant4/config


Ignore:
Timestamp:
Nov 15, 2007, 11:56:03 AM (17 years ago)
Author:
garnier
Message:

r647@mac-90108: laurentgarnier | 2007-11-15 11:32:46 +0100
Ok en Qt 4.3.0

Location:
trunk/geant4/config
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/config/History

    r593 r606  
    1 $Id: History,v 1.300 2007/08/16 09:34:51 gcosmo Exp $
     1$Id: History,v 1.303 2007/11/02 15:58:08 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     ----------------------------------------------------------
    1818
     192nd November 2007  Gabriele Cosmo (config-V09-00-06)
     20- Introduced G4LIB_BUILD_GDML/G4LIB_USE_GDML flags to trigger compilation
     21  of the new persistency/gdml sub-module. Added setup for XERCESC.
     22  Required path XERCESCROOT to XERCESC installation if G4LIB_BUILD_GDML
     23  is set. Added "persistency/gdml" include path to binmake.gmk
     24- Added setup for QT in UI scripts, and specific QT paths and setup in
     25  Darwin-g++.gmk. (L.Garnier)
     26
     2710th October 2007  Gunter Folger (config-V09-00-05)
     28- Added "incl" (Liege cascade) hadronic model module to binmake.gmk.
     29 
    193016th August 2007  Gabriele Cosmo (config-V09-00-04)
    2031- Corrected definition of OUT internal variable to allow for proper

  • trunk/geant4/config/architecture.gmk

    r593 r606  
    1 # $Id: architecture.gmk,v 1.110 2007/06/28 14:16:55 gcosmo Exp $
     1# $Id: architecture.gmk,v 1.112 2007/11/02 16:29:06 gcosmo Exp $
    22# ------------------------------------------------------------------------
    33#       GEANT 4 - Architecture configuration script for GNU Make
    … …  
    241241# If the user does not set his/her own values, system-dependent values
    242242# are set below.  Most system-dependent code assumes OGLHOME is set.
    243 #
     243
    244244# ------------- OpenInventor -----------------
    245245# The path to the installation of OpenInventor must be specified
    … …  
    255255ifndef OIVLIBS
    256256  OIVLIBS   := -L$(OIVHOME)/lib -lInventorXt -lInventor
     257endif
     258
     259# ----------------- GDML ---------------------
     260# Setup path to XERCESC library if GDML plugin build is specified
     261#
     262ifneq ($(G4LIB_BUILD_GDML),)
     263  G4LIB_USE_GDML = 1
     264  ifndef XERCESCROOT
     265    XERCESCROOT := /usr/local/xercesc
     266  endif
     267  ifndef GDMLFLAGS
     268    GDMLFLAGS := -DG4LIB_USE_GDML -I$(XERCESCROOT)/include
     269  endif
     270  ifndef GDMLLIBS
     271    GDMLLIBS := -L$(XERCESCROOT)/lib -lxerces-depdom -lxerces-c
     272  endif
     273  CPPFLAGS  += $(GDMLFLAGS)
    257274endif
    258275

  • trunk/geant4/config/binmake.gmk

    r593 r606  
    1 # $Id: binmake.gmk,v 1.129 2007/08/16 09:46:02 gcosmo Exp $
     1# $Id: binmake.gmk,v 1.133 2007/11/02 15:57:52 gcosmo Exp $
    22# ----------------------------------------------------------
    33# Script defining rules and paths for making binaries.
    … …  
    5252              -I$(G4BASE)/run/include \
    5353              -I$(G4BASE)/materials/include \
    54               -I$(G4BASE)/parameterisations/trd_clusters/include \
    5554              -I$(G4BASE)/parameterisations/gflash/include \
    5655              -I$(G4BASE)/particles/management/include \
    … …  
    102101              -I$(G4BASE)/processes/hadronic/models/high_energy/include \
    103102              -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
     103              -I$(G4BASE)/processes/hadronic/models/incl/include \
    104104              -I$(G4BASE)/processes/hadronic/models/inucl/include \
    105105              -I$(G4BASE)/processes/hadronic/models/isotope_production/include \
    … …  
    143143              -I$(G4BASE)/digits_hits/scorer/include \
    144144              -I$(G4BASE)/digits_hits/utils/include \
    145               -I$(G4BASE)/persistency/include \
     145              -I$(G4BASE)/persistency/gdml/include \
     146              -I$(G4BASE)/persistency/mctruth/include \
    146147              -I$(G4BASE)/readout/include \
    147148              -I$(G4BASE)/event/include \
    … …  
    260261# LDLIBS3 contains the first set of low level libraries...
    261262#
     263ifdef G4LIB_BUILD_GDML
     264  LDLIBS3 += $(GDMLLIBS)
     265endif
    262266LDLIBS3 += $(INTYLIBS)
    263267LDLIBS3 += $(ANALYSISLIBS)

  • trunk/geant4/config/scripts/env.csh.SH

    r593 r606  
    4040unsetenv  G4NEUTRONHPDATA
    4141unsetenv  G4RADIOACTIVEDATA
     42unsetenv  G4ABLADATA
    4243
    4344unsetenv  G4LIB
    … …  
    4647unsetenv  G4LIB_BUILD_STATIC
    4748unsetenv  G4LIB_BUILD_ZLIB
     49unsetenv  G4LIB_BUILD_GDML
    4850unsetenv  G4LIB_USE_G3TOG4
    4951unsetenv  G4LIB_USE_GRANULAR
    … …  
    146148
    147149#+
     150if ( X$g4abladata != X ) then
     151setenv G4ABLADATA "$g4abladata"
     152echo "On this machine the G4ABLADATA=\$G4ABLADATA"
     153endif
     154
     155
     156#+
    148157#if ( X$g4elasticdata != X ) then
    149158#setenv G4ELASTICDATA "$g4elasticdata"
    … …  
    380389echo "On this machine the XAWLIBS=\$XAWLIBS"
    381390endif
     391
     392
     393
     394#
     395# Use GDML module
     396#
     397#+
     398if ( X$g4lib_build_gdml == Xy ) then
     399setenv G4LIB_BUILD_GDML 1
     400echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
     401endif
     402
     403if ( X$g4lib_build_gdml == Xy ) then
     404setenv XERCESCROOT "$g4gdml_xercesc_root"
     405echo "On this machine the XERCESCROOT=\$XERCESCROOT"
     406endif
     407
     408
     409
    382410
    383411#
    … …  
    489517setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    490518setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     519
     520if ( ${?G4LIB_BUILD_GDML} ) then
     521   setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
     522endif
     523
    491524else
    492525setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
    493526setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     527
     528if ( ${?G4LIB_BUILD_GDML} ) then
     529   setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
     530endif
     531
    494532endif
    495533endif
    … …  
    504542setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    505543setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     544
     545if ( ${?G4LIB_BUILD_GDML} ) then
     546   setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
     547endif
     548
    506549else
    507550setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
    508551setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     552
     553if ( ${?G4LIB_BUILD_GDML} ) then
     554   setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
     555endif
     556
    509557endif
    510558endif

  • trunk/geant4/config/scripts/env.sh.SH

    r593 r606  
    4040unset  G4NEUTRONHPDATA
    4141unset  G4RADIOACTIVEDATA
     42unset  G4ABLADATA
    4243
    4344unset  G4LIB
    … …  
    4647unset  G4LIB_BUILD_STATIC
    4748unset  G4LIB_BUILD_ZLIB
     49unset  G4LIB_BUILD_GDML
    4850unset  G4LIB_USE_G3TOG4
    4951unset  G4LIB_USE_GRANULAR
    … …  
    172174
    173175#+
     176if [ X$g4abladata != X ] ; then
     177G4ABLADATA="$g4abladata"
     178export G4ABLADATA
     179if [ X\$g4non_display = X ] ; then
     180echo "On this machine the G4ABLADATA=\$G4ABLADATA"
     181fi
     182fi
     183
     184
     185
     186
     187#+
    174188#if [ X$g4elasticdata != X ] ; then
    175189#G4ELASTICDATA="$g4elasticdata"
    … …  
    517531fi
    518532fi
     533
     534
     535#
     536# Use GDML module
     537#
     538#+
     539if [ X$g4lib_build_gdml = Xy ] ; then
     540G4LIB_BUILD_GDML=1
     541export G4LIB_BUILD_GDML
     542echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
     543fi
     544
     545if [ X$g4lib_build_gdml = Xy ] ; then
     546XERCESCROOT=$g4gdml_xercesc_root
     547export XERCESCROOT
     548echo "On this machine the XERCESCROOT=\$XERCESCROOT"
     549fi
     550
     551
    519552
    520553#
    … …  
    670703LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    671704LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     705
     706if [ $G4LIB_BUILD_GDML ] ; then
     707   LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
     708fi
    672709export LD_LIBRARY_PATH
     710
    673711else
    674712LD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
    675713LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     714
     715if [ $G4LIB_BUILD_GDML ] ; then
     716   LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
     717fi
     718
    676719export LD_LIBRARY_PATH
    677720fi
    … …  
    687730DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    688731DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     732
     733if [ $G4LIB_BUILD_GDML ] ; then
     734   DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
     735fi
     736
    689737export DYLD_LIBRARY_PATH
    690738else
    691739DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
    692740DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     741
     742if [ $G4LIB_BUILD_GDML ] ; then
     743   DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
     744fi
     745
    693746export DYLD_LIBRARY_PATH
    694747fi

  • trunk/geant4/config/scripts/install.sh.SH

    r593 r606  
    4040unset  G4NEUTRONHPDATA
    4141unset  G4RADIOACTIVEDATA
     42unset  G4ABLADATA
    4243
    4344unset  G4LIB
    … …  
    4647unset  G4LIB_BUILD_STATIC
    4748unset  G4LIB_BUILD_ZLIB
     49unset  G4LIB_BUILD_GDML
    4850unset  G4LIB_USE_G3TOG4
    4951unset  G4LIB_USE_GRANULAR
    … …  
    151153
    152154#+
     155if [ X$g4abladata != X ] ; then
     156G4ABLADATA="$g4abladata"
     157export G4ABLADATA
     158echo "On this machine the G4ABLADATA=\$G4ABLADATA"
     159fi
     160
     161
     162
     163
     164#+
    153165#if [ X$g4elasticdata != X ] ; then
    154166#G4ELASTICDATA="$g4elasticdata"
    … …  
    442454fi
    443455fi
     456
     457
     458#
     459# Use GDML module
     460#
     461#+
     462if [ X$g4lib_build_gdml = Xy ] ; then
     463G4LIB_BUILD_GDML=1
     464export G4LIB_BUILD_GDML
     465echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
     466fi
     467
     468if [ X$g4lib_build_gdml = Xy ] ; then
     469XERCESCROOT=$g4gdml_xercesc_root
     470export XERCESCROOT
     471echo "On this machine the XERCESCROOT=\$XERCESCROOT"
     472fi
     473
    444474
    445475#

  • trunk/geant4/config/scripts/move.sh.SH

    r593 r606  
    9696
    9797#+
     98if [ X$g4abladata != X ] ; then
     99G4ABLADATA="$g4abladata"
     100export G4ABLADATA
     101echo "On this machine the G4ABLADATA=\$G4ABLADATA"
     102fi
     103
     104
     105
     106#+
    98107#if [ X$g4elasticdata != X ] ; then
    99108#G4ELASTICDATA="$g4elasticdata"
    … …  
    305314fi
    306315
     316
     317#
     318# Use GDML module
     319#
     320#+
     321if [ X$g4lib_build_gdml = Xy ] ; then
     322G4LIB_BUILD_GDML=1
     323export G4LIB_BUILD_GDML
     324echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
     325fi
     326
     327if [ X$g4lib_build_gdml = Xy ] ; then
     328XERCESCROOT=$g4gdml_xercesc_root
     329export XERCESCROOT
     330echo "On this machine the XERCESCROOT=\$XERCESCROOT"
     331fi
     332
     333
     334
    307335#
    308336# Use G3TOG4 module

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

    r593 r606  
    5151  endif
    5252  ifndef QTFLAGS
    53     QTFLAGS   := -I$(QTHOME)/include
    54     QTFLAGS   += -I$(QTHOME)/lib/QtCore.framework/Versions/Current/Headers
    55     QTFLAFS   += -I$(QTHOME)/lib/QtGui.framework/Versions/Current/Headers
    56     QTFLAGS   += -I$(QTHOME)/lib/QtOpenGL.framework/Versions/Current/Headers
    57     QTFLAGS   += -I$(QTHOME)/lib/QtSql.framework/Versions/Current/Headers
    58     QTFLAGS   += -I$(QTHOME)/lib/QtXml.framework/Versions/Current/Headers
     53    QTFLAGS   := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
    5954    MOC       := $(QTHOME)/bin/moc
    6055  endif
    6156  ifndef QTLIBS
    62     QTLIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
    63     QTLIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
     57    QT3LIBS    := -L$(QTHOME)/lib -lqt-mt -lqui
     58    QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
     59    QT4LIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
     60    QTLIBS     := $(shell test -f $(QTHOME)/lib/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
    6461  endif
    6562  ifndef XAWFLAGS

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

    r472 r606  
    5555    XMLIBS    := -lXm -lXpm
    5656  endif
     57  ifndef QTHOME
     58    QTHOME  := /usr/local/Qt
     59  endif
     60  ifndef QTFLAGS
     61    QTFLAGS   := -I$(QTHOME)/include/Qt
     62    QTFLAGS   += -I$(QTHOME)/include
     63    MOC       := $(QTHOME)/bin/moc
     64  endif
     65  ifndef QTLIBS
     66    QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
     67    QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
     68    QTLIBS     := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS))
     69  endif
    5770  ifndef XAWFLAGS
    5871    XAWFLAGS   := -I/usr/X11R6/include
Note: See TracChangeset for help on using the changeset viewer.