Import Geant4 9.1.0 source tree

This commit is contained in:
Gabriele Cosmo
2016-06-09 15:37:50 +02:00
parent a8e9364cea
commit 96c8bcd0af
6923 changed files with 198390 additions and 41849 deletions
+13 -1
View File
@@ -1,4 +1,4 @@
# $Id: G4UI_BUILD.gmk,v 1.4 2003/10/17 10:17:10 gbarrand Exp $
# $Id: G4UI_BUILD.gmk,v 1.5 2007/10/03 12:15:05 lgarnier Exp $
# -------------------------------------------------------------
# Interfaces-specific CPPFLAGS for BUILD phase.
# John Allison, 6th July 1998.
@@ -22,6 +22,14 @@ ifdef G4UI_BUILD_XM_SESSION
CPPFLAGS += -DG4UI_BUILD_XM_SESSION
endif
ifdef G4UI_BUILD_QT_SESSION
G4UI_BUILD = 1
G4UI_BUILD_BASIC_SESSION = 1
G4INTY_BUILD_QT = 1
INC_QT = 1
CPPFLAGS += -DG4UI_BUILD_QT_SESSION
endif
ifdef G4UI_BUILD_XAW_SESSION
G4UI_BUILD = 1
G4UI_BUILD_BASIC_SESSION = 1
@@ -47,6 +55,10 @@ ifdef G4LIB_BUILD_SHARED
G4UI_USE_XM = 1
endif
ifdef G4UI_BUILD_QT_SESSION
G4UI_USE_QT = 1
endif
ifdef G4UI_BUILD_XAW_SESSION
G4UI_USE_XAW = 1
endif
+9 -1
View File
@@ -1,4 +1,4 @@
# $Id: G4UI_USE.gmk,v 1.8 2003/10/17 10:17:10 gbarrand Exp $
# $Id: G4UI_USE.gmk,v 1.9 2007/10/03 12:15:05 lgarnier Exp $
# -------------------------------------------------------------
# GNUmakefile for CPPFLAGS for interfaces USE phase.
# John Allison, 6th July 1998.
@@ -58,6 +58,14 @@ ifdef G4UI_USE_XM
CPPFLAGS += -DG4UI_USE_XM
endif
ifdef G4UI_USE_QT
G4UI_USE = 1
G4INTY_USE_QT = 1
INC_QT = 1
LOAD_QT = 1
CPPFLAGS += -DG4UI_USE_QT
endif
ifdef G4UI_USE_XAW
G4UI_USE = 1
G4INTY_USE_XT = 1
+20 -1
View File
@@ -1,4 +1,4 @@
# $Id: G4VIS_BUILD.gmk,v 1.19 2005/10/05 17:35:40 allison Exp $
# $Id: G4VIS_BUILD.gmk,v 1.20 2007/10/03 12:15:05 lgarnier Exp $
# -------------------------------------------------------------
# Visualization-specific CPPFLAGS for BUILD phase.
# John Allison, 24th January 1998.
@@ -29,6 +29,12 @@ ifdef G4VIS_BUILD_OPENGLXM_DRIVER
INC_XM = 1
CPPFLAGS += -DG4VIS_BUILD_OPENGLXM_DRIVER
endif
ifdef G4VIS_BUILD_OPENGLQT_DRIVER
G4VIS_BUILD_OPENGL_DRIVER = 1
G4INTY_BUILD_QT = 1
INC_QT = 1
CPPFLAGS += -DG4VIS_BUILD_OPENGLQT_DRIVER
endif
ifdef G4VIS_BUILD_OPENGLX_DRIVER
G4VIS_BUILD_OPENGL_DRIVER = 1
INC_X11 = 1
@@ -49,6 +55,11 @@ ifdef G4VIS_BUILD_OIX_DRIVER
G4INTY_BUILD_XT = 1
CPPFLAGS += -DG4VIS_BUILD_OIX_DRIVER
endif
ifdef G4VIS_BUILD_OIQT_DRIVER
G4VIS_BUILD_OI_DRIVER = 1
G4INTY_BUILDQT = 1
CPPFLAGS += -DG4VIS_BUILD_OIQT_DRIVER
endif
ifdef G4VIS_BUILD_OIWIN32_DRIVER
G4VIS_BUILD_OI_DRIVER = 1
G4INTY_BUILD_WIN32 = 1
@@ -86,6 +97,10 @@ ifdef G4LIB_BUILD_SHARED
G4VIS_USE_OPENGLXM = 1
endif
ifdef G4VIS_BUILD_OPENGLQT_DRIVER
G4VIS_USE_OPENGLQT = 1
endif
ifdef G4VIS_BUILD_OPENGL_DRIVER
G4VIS_USE_OPENGL = 1
endif
@@ -94,6 +109,10 @@ ifdef G4LIB_BUILD_SHARED
G4VIS_USE_OIX = 1
endif
ifdef G4VIS_BUILD_OIQT_DRIVER
G4VIS_USE_OIQT = 1
endif
ifdef G4VIS_BUILD_OIWIN32_DRIVER
G4VIS_USE_OIWIN32 = 1
endif
+12 -1
View File
@@ -1,4 +1,4 @@
# $Id: G4VIS_USE.gmk,v 1.22 2005/10/05 17:35:40 allison Exp $
# $Id: G4VIS_USE.gmk,v 1.23 2007/10/03 12:15:05 lgarnier Exp $
# -------------------------------------------------------------
# GNUmakefile for CPPFLAGS for visualization USE phase.
# John Allison, 24th January 1998.
@@ -56,6 +56,11 @@ ifdef G4VIS_USE_OPENGLXM
INC_XM = 1
LOAD_XM = 1
endif
ifdef G4VIS_USE_OPENGLQT
G4VIS_USE_OPENGL = 1
CPPFLAGS += -DG4VIS_USE_OPENGLQT
INC_QT = 1
endif
ifdef G4VIS_USE_OPENGLWIN32
G4VIS_USE_OPENGL = 1
CPPFLAGS += -DG4VIS_USE_OPENGLWIN32
@@ -76,6 +81,12 @@ ifdef G4VIS_USE_OIX
INC_XM = 1
LOAD_XM = 1
endif
ifdef G4VIS_USE_OIQT
G4VIS_USE_OI = 1
CPPFLAGS += -DG4VIS_USE_OIQT
INC_QT = 1
LOAD_QT = 1
endif
ifdef G4VIS_USE_OIWIN32
G4VIS_USE_OI = 1
CPPFLAGS += -DG4VIS_USE_OIWIN32
+56 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.295 2007/06/28 17:01:13 gcosmo Exp $
$Id: History,v 1.310 2007/12/11 13:20:28 gcosmo Exp $
-------------------------------------------------------------------
=========================================================
@@ -16,6 +16,61 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
11th December 2007 Gabriele Cosmo (config-V09-00-12)
- Corrected setup for GDML on WIN32-VC to allow for building DLLs.
30th November 2007 Ben Morgan (config-V09-00-11)
- Updated Configure script to handle Qt UI build.
- Updated internal scripts for Configure accordingly.
22nd November 2007 Gabriele Cosmo (config-V09-00-10)
- Corrected addition of lXercesC and Zlib libraries in binmake.gmk.
- Added special case for WIN32-VC for names of XercesC libraries in architecture.gmk.
- Use 'gfortran' instead of 'g77' in Darwing-g++.gmk script. (I.McLaren)
19th November 2007 Gabriele Cosmo (config-V09-00-09)
- Added "qmd" hadronic model to binmake.gmk.
16th November 2007 Laurent Garnier (config-V09-00-08)
- Updated setup for Qt in Linux-g++.gmk and Darwin-g++.gmk scripts to
support both Qt3 and Qt4.
15th November 2007 Ben Morgan (config-V09-00-07)
- Updated Configure script to handle new 'gdml' sub-module and new data
libraries (G4ABLADATA and new G4EMLOW version).
- Updated internal scripts for Configure accordingly.
2nd November 2007 Gabriele Cosmo (config-V09-00-06)
- Introduced G4LIB_BUILD_GDML/G4LIB_USE_GDML flags to trigger compilation
of the new persistency/gdml sub-module. Added setup for XERCESC.
Required path XERCESCROOT to XERCESC installation if G4LIB_BUILD_GDML
is set. Added "persistency/gdml" include path to binmake.gmk
- Added setup for QT in UI scripts, and specific QT paths and setup in
Darwin-g++.gmk. (L.Garnier)
10th October 2007 Gunter Folger (config-V09-00-05)
- Added "incl" (Liege cascade) hadronic model module to binmake.gmk.
16th August 2007 Gabriele Cosmo (config-V09-00-04)
- Corrected definition of OUT internal variable to allow for proper
linking also of unit tests.
15th August 2007 Gabriele Cosmo (config-V09-00-03)
- Added "rpg" hadronic model module to binmake.gmk.
13th August 2007 Gabriele Cosmo (config-V09-00-02)
- SUN-CC.gmk: forced -xO2 as optimisation level.
18th July 2007 Gabriele Cosmo (config-V09-00-01)
- liblist.c: fixed problem affecting recent CygWin installations on
Windows in parsing the buffer for the generation of libname.map.
- binmake.gmk: defined OUT internal variable specifying the proper
compilation/linking option to Unix or Windows compilers: '-o '
and '/Fe' respectively.
11th July 2007 Makoto Asai (config-V09-00-00)
- Added digits_hits/scorer sub-directory to binmake.gmk.
28th June 2007 Gabriele Cosmo (config-V08-03-04)
- Updated Configure scripts to fix installation issue when installation
path is different from source path and headers are not installed.
+23 -2
View File
@@ -1,4 +1,4 @@
# $Id: architecture.gmk,v 1.110 2007/06/28 14:16:55 gcosmo Exp $
# $Id: architecture.gmk,v 1.114 2007/12/11 13:20:29 gcosmo Exp $
# ------------------------------------------------------------------------
# GEANT 4 - Architecture configuration script for GNU Make
#
@@ -240,7 +240,7 @@ endif
# compiler. OGLHOME can also point to a special installation.
# If the user does not set his/her own values, system-dependent values
# are set below. Most system-dependent code assumes OGLHOME is set.
#
# ------------- OpenInventor -----------------
# The path to the installation of OpenInventor must be specified
# if the package is installed in a location different
@@ -256,6 +256,27 @@ ifndef OIVLIBS
OIVLIBS := -L$(OIVHOME)/lib -lInventorXt -lInventor
endif
# ----------------- GDML ---------------------
# Setup path to XERCESC library if GDML plugin build is specified
#
ifneq ($(G4LIB_BUILD_GDML),)
G4LIB_USE_GDML = 1
ifndef XERCESCROOT
XERCESCROOT := /usr/local/xercesc
endif
ifndef GDMLFLAGS
GDMLFLAGS := -DG4LIB_USE_GDML -I$(XERCESCROOT)/include
endif
ifndef GDMLLIBS
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
GDMLLIBS := $(LIB_PATH)$(XERCESCROOT)/lib xerces-depdom_2.lib xerces-c_2.lib
else
GDMLLIBS := -L$(XERCESCROOT)/lib -lxerces-depdom -lxerces-c
endif
endif
CPPFLAGS += $(GDMLFLAGS)
endif
# For cfront compilers the repository location is set to
# $G4TMP/$G4SYSTEM/g4.ptrepository.
#
+17 -6
View File
@@ -1,4 +1,4 @@
# $Id: binmake.gmk,v 1.123 2007/06/28 14:16:55 gcosmo Exp $
# $Id: binmake.gmk,v 1.135 2007/11/22 14:08:10 gcosmo Exp $
# ----------------------------------------------------------
# Script defining rules and paths for making binaries.
# First implementation: Gabriele Cosmo, 25/06/1998.
@@ -51,7 +51,6 @@ ifndef INCFLAGS
-I$(G4BASE)/global/HEPNumerics/include \
-I$(G4BASE)/run/include \
-I$(G4BASE)/materials/include \
-I$(G4BASE)/parameterisations/trd_clusters/include \
-I$(G4BASE)/parameterisations/gflash/include \
-I$(G4BASE)/particles/management/include \
-I$(G4BASE)/particles/bosons/include \
@@ -101,6 +100,7 @@ ifndef INCFLAGS
-I$(G4BASE)/processes/hadronic/models/general_finalstate/include \
-I$(G4BASE)/processes/hadronic/models/high_energy/include \
-I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
-I$(G4BASE)/processes/hadronic/models/incl/include \
-I$(G4BASE)/processes/hadronic/models/inucl/include \
-I$(G4BASE)/processes/hadronic/models/isotope_production/include \
-I$(G4BASE)/processes/hadronic/models/leading_particle/include \
@@ -114,11 +114,13 @@ ifndef INCFLAGS
-I$(G4BASE)/processes/hadronic/models/parton_string/qgsm/include \
-I$(G4BASE)/processes/hadronic/models/photolepton_hadron/muon_nuclear/include \
-I$(G4BASE)/processes/hadronic/models/pre_equilibrium/exciton_model/include \
-I$(G4BASE)/processes/hadronic/models/qmd/include \
-I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/body/include \
-I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/util/include \
-I$(G4BASE)/processes/hadronic/models/radioactive_decay/include \
-I$(G4BASE)/processes/hadronic/models/relativistic_qmd/include \
-I$(G4BASE)/processes/hadronic/models/relativistic_qmd/uplusplus/include \
-I$(G4BASE)/processes/hadronic/models/rpg/include \
-I$(G4BASE)/processes/hadronic/models/theo_high_energy/include \
-I$(G4BASE)/processes/hadronic/models/util/include \
-I$(G4BASE)/processes/hadronic/processes/include \
@@ -139,8 +141,10 @@ ifndef INCFLAGS
-I$(G4BASE)/digits_hits/detector/include \
-I$(G4BASE)/digits_hits/hits/include \
-I$(G4BASE)/digits_hits/digits/include \
-I$(G4BASE)/digits_hits/scorer/include \
-I$(G4BASE)/digits_hits/utils/include \
-I$(G4BASE)/persistency/include \
-I$(G4BASE)/persistency/gdml/include \
-I$(G4BASE)/persistency/mctruth/include \
-I$(G4BASE)/readout/include \
-I$(G4BASE)/event/include \
-I$(G4BASE)/error_propagation/include \
@@ -251,12 +255,15 @@ else
endif
endif
ifdef G4LIB_BUILD_ZLIB
ifdef G4LIB_USE_ZLIB
LDLIBS2 += -lG4zlib
endif
# LDLIBS3 contains the first set of low level libraries...
#
ifdef G4LIB_USE_GDML
LDLIBS3 += $(GDMLLIBS)
endif
LDLIBS3 += $(INTYLIBS)
LDLIBS3 += $(ANALYSISLIBS)
@@ -282,6 +289,7 @@ LDLIBS_PREFINAL += $(LDLIBS4)
LDLIBS_KERNEL += $(LDLIBS4)
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
# Windows
WIN32TMP := $(patsubst -L%,$(LIB_PATH)%,$(LDFLAGS))
LDFLAGS = $(patsubst /,$(PATH_DEL),$(WIN32TMP))
WIN32TMP2 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS_PREFINAL))
@@ -296,8 +304,11 @@ ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
else
LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP2))
endif
OUT := /Fe
else
# Unix
LDLIBS = $(TARGETLIB) $(LDLIBS_PREFINAL)
OUT := -o
endif
ifdef transform-RPath
@@ -339,12 +350,12 @@ endif
@if [ ! -d $(G4BINDIR) ] ; then mkdir $(G4BINDIR) ;fi
ifdef CPPVERBOSE
$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
-o $(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
$(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
$(LDLIBS)
else
@echo Linking $(G4TARGET) ...
@$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
-o $(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
$(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
$(LDLIBS)
@if [ \( -f $(G4BINDIR)/$(G4TARGET) \) ]; then \
echo "... Done!"; fi
+17
View File
@@ -62,16 +62,33 @@ ifdef LOAD_X11
INTYLIBS += $(X11LIBS)
endif
########################### Qt ###################
ifdef INC_QT
CPPFLAGS += $(QTFLAGS)
endif
ifdef LOAD_QT
INTYLIBS += $(QTLIBS)
endif
########################### and finally... #######################
ifdef G4INTY_BUILD_XT
CPPFLAGS += -DG4INTY_BUILD_XT
endif
ifdef G4INTY_BUILD_QT
CPPFLAGS += -DG4INTY_BUILD_QT
endif
ifdef G4INTY_USE_XT
CPPFLAGS += -DG4INTY_USE_XT
endif
ifdef G4INTY_USE_QT
CPPFLAGS += -DG4INTY_USE_QT
endif
ifdef G4INTY_BUILD_WIN32
CPPFLAGS += -DG4INTY_BUILD_WIN32
endif
+1 -2
View File
@@ -1,4 +1,4 @@
/* $Id: liblist.c,v 1.18 2006/10/05 14:22:06 gcosmo Exp $ */
/* $Id: liblist.c,v 1.19 2007/07/18 14:21:15 gcosmo Exp $ */
/*
Given a "libname.map" file on standard input and a list or directory
@@ -303,7 +303,6 @@ int main (int argc, char** argv) {
#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
ptr=strchr(ntg4tmp1,':');
if ( ptr ) *(ptr+1)='\0';
while ( ptr=strchr(buffer,'\\') ) *ptr='/';
+86
View File
@@ -39,12 +39,14 @@ unsetenv G4LEDATA
unsetenv G4LEVELGAMMADATA
unsetenv G4NEUTRONHPDATA
unsetenv G4RADIOACTIVEDATA
unsetenv G4ABLADATA
unsetenv G4LIB
unsetenv G4LIB_BUILD_G3TOG4
unsetenv G4LIB_BUILD_SHARED
unsetenv G4LIB_BUILD_STATIC
unsetenv G4LIB_BUILD_ZLIB
unsetenv G4LIB_BUILD_GDML
unsetenv G4LIB_USE_G3TOG4
unsetenv G4LIB_USE_GRANULAR
unsetenv G4LIB_USE_ZLIB
@@ -58,6 +60,7 @@ unsetenv G4UI_USE_TCSH
unsetenv G4UI_USE_WIN32
unsetenv G4UI_USE_XAW
unsetenv G4UI_USE_XM
unsetenv G4UI_USE_QT
unsetenv G4VIS_BUILD_DAWN_DRIVER
unsetenv G4VIS_BUILD_OIWIN32_DRIVER
@@ -67,6 +70,7 @@ unsetenv G4VIS_BUILD_OPENGLXM_DRIVER
unsetenv G4VIS_BUILD_OPENGLX_DRIVER
unsetenv G4VIS_BUILD_RAYTRACERX_DRIVER
unsetenv G4VIS_BUILD_VRML_DRIVER
unsetenv G4VIS_BUILD_OPENGLQT_DRIVER
unsetenv G4VIS_USE_DAWN
unsetenv G4VIS_USE_OIWIN32
@@ -76,6 +80,7 @@ unsetenv G4VIS_USE_OPENGLX
unsetenv G4VIS_USE_OPENGLXM
unsetenv G4VIS_USE_RAYTRACERX
unsetenv G4VIS_USE_VRML
unsetenv G4VIS_USE_OPENGLQT
######################################
#
@@ -144,6 +149,13 @@ setenv G4NEUTRONHPDATA "$g4neutronhpcrosssections"
echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
endif
#+
if ( X$g4abladata != X ) then
setenv G4ABLADATA "$g4abladata"
echo "On this machine the G4ABLADATA=\$G4ABLADATA"
endif
#+
#if ( X$g4elasticdata != X ) then
#setenv G4ELASTICDATA "$g4elasticdata"
@@ -233,6 +245,20 @@ setenv G4UI_USE_WIN32 1
echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
endif
#+
if ( X$g4ui_build_qt_session == Xy ) then
setenv G4UI_BUILD_QT_SESSION 1
echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
endif
#+
if ( X$g4ui_use_qt == Xy ) then
setenv G4UI_USE_QT 1
echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
endif
#
# g4vis
#
@@ -284,6 +310,13 @@ setenv G4VIS_BUILD_VRML_DRIVER 1
echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
endif
#+
if ( X$g4vis_build_openglqt_driver == Xy ) then
setenv G4VIS_BUILD_OPENGLQT_DRIVER 1
echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
endif
#+
if ( X$g4vis_use_dawn == Xy ) then
setenv G4VIS_USE_DAWN 1
@@ -332,6 +365,12 @@ setenv G4VIS_USE_VRML 1
echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
endif
#+
if ( X$g4vis_use_openglqt == Xy ) then
setenv G4VIS_USE_OPENGLQT 1
echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
endif
#+
if ( X$g4vis_oglhome != X ) then
setenv OGLHOME "$g4vis_oglhome"
@@ -344,6 +383,14 @@ setenv OIVHOME "$g4vis_oivhome"
echo "On this machine the OIVHOME=\$OIVHOME"
endif
#+
if ( X$g4_qthome != X ) then
setenv QTHOME "$g4_qthome"
echo "On this machine the QTHOME=\$QTHOME"
endif
#+
if ( X$g4vis_build_openglxm_driver != X ) then
setenv XMFLAGS "$g4vis_xmflags"
@@ -380,6 +427,25 @@ setenv XAWLIBS "$g4ui_xawlibs"
echo "On this machine the XAWLIBS=\$XAWLIBS"
endif
#
# Use GDML module
#
#+
if ( X$g4lib_build_gdml == Xy ) then
setenv G4LIB_BUILD_GDML 1
echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
endif
if ( X$g4lib_build_gdml == Xy ) then
setenv XERCESCROOT "$g4gdml_xercesc_root"
echo "On this machine the XERCESCROOT=\$XERCESCROOT"
endif
#
# Use G3TOG4 module
#
@@ -488,9 +554,19 @@ echo ''
if ( ${?LD_LIBRARY_PATH} ) then
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
if ( ${?G4LIB_BUILD_GDML} ) then
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
endif
else
setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
if ( ${?G4LIB_BUILD_GDML} ) then
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
endif
endif
endif
@@ -503,9 +579,19 @@ if ( ${?G4LIB_BUILD_SHARED} ) then
if ( ${?DYLD_LIBRARY_PATH} ) then
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
if ( ${?G4LIB_BUILD_GDML} ) then
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
endif
else
setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
if ( ${?G4LIB_BUILD_GDML} ) then
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
endif
endif
endif
+109
View File
@@ -39,12 +39,14 @@ unset G4LEDATA
unset G4LEVELGAMMADATA
unset G4NEUTRONHPDATA
unset G4RADIOACTIVEDATA
unset G4ABLADATA
unset G4LIB
unset G4LIB_BUILD_G3TOG4
unset G4LIB_BUILD_SHARED
unset G4LIB_BUILD_STATIC
unset G4LIB_BUILD_ZLIB
unset G4LIB_BUILD_GDML
unset G4LIB_USE_G3TOG4
unset G4LIB_USE_GRANULAR
unset G4LIB_USE_ZLIB
@@ -58,6 +60,7 @@ unset G4UI_USE_TCSH
unset G4UI_USE_WIN32
unset G4UI_USE_XAW
unset G4UI_USE_XM
unset G4UI_USE_QT
unset G4VIS_BUILD_DAWN_DRIVER
unset G4VIS_BUILD_OIWIN32_DRIVER
@@ -67,6 +70,7 @@ unset G4VIS_BUILD_OPENGLXM_DRIVER
unset G4VIS_BUILD_OPENGLX_DRIVER
unset G4VIS_BUILD_RAYTRACERX_DRIVER
unset G4VIS_BUILD_VRML_DRIVER
unset G4VIS_BUILD_OPENGLQT_DRIVER
unset G4VIS_USE_DAWN
unset G4VIS_USE_OIWIN32
@@ -76,6 +80,7 @@ unset G4VIS_USE_OPENGLX
unset G4VIS_USE_OPENGLXM
unset G4VIS_USE_RAYTRACERX
unset G4VIS_USE_VRML
unset G4VIS_USE_OPENGLQT
#
@@ -170,6 +175,18 @@ echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
fi
fi
#+
if [ X$g4abladata != X ] ; then
G4ABLADATA="$g4abladata"
export G4ABLADATA
if [ X\$g4non_display = X ] ; then
echo "On this machine the G4ABLADATA=\$G4ABLADATA"
fi
fi
#+
#if [ X$g4elasticdata != X ] ; then
#G4ELASTICDATA="$g4elasticdata"
@@ -298,6 +315,27 @@ echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
fi
fi
#+
if [ X$g4ui_build_qt_session = Xy ] ; then
G4UI_BUILD_QT_SESSION=1
export G4UI_BUILD_QT_SESSION
if [ X\$g4non_display = X ] ; then
echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
fi
fi
#+
if [ X$g4ui_use_qt = Xy ] ; then
G4UI_USE_QT=1
export G4UI_USE_QT
if [ X\$g4non_display = X ] ; then
echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
fi
fi
#
# g4vis
#
@@ -373,6 +411,17 @@ echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
fi
fi
#+
if [ X$g4vis_build_openglqt_driver = Xy ] ; then
G4VIS_BUILD_OPENGLQT_DRIVER=1
export G4VIS_BUILD_OPENGLQT_DRIVER
if [ X\$g4non_display = X ] ; then
echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
fi
fi
#+
if [ X$g4vis_use_dawn = Xy ] ; then
G4VIS_USE_DAWN=1
@@ -445,6 +494,17 @@ echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
fi
fi
#+
if [ X$g4vis_use_openglqt = Xy ] ; then
G4VIS_USE_OPENGLQT=1
export G4VIS_USE_OPENGLQT
if [ X\$g4non_display = X ] ; then
echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
fi
fi
#+
if [ X$g4vis_oglhome != X ] ; then
OGLHOME="$g4vis_oglhome"
@@ -463,6 +523,16 @@ echo "On this machine the OIVHOME=\$OIVHOME"
fi
fi
#+
if [ X$g4_qthome != X ] ; then
QTHOME=$g4_qthome
export QTHOME
if [ X\$g4non_display = X ] ; then
echo "On this machine the QTHOME=\$QTHOME"
fi
fi
#+
if [ X$g4vis_build_openglxm_driver != X ] ; then
XMFLAGS="$g4vis_xmflags"
@@ -517,6 +587,25 @@ echo "On this machine the XAWLIBS=\$XAWLIBS"
fi
fi
#
# Use GDML module
#
#+
if [ X$g4lib_build_gdml = Xy ] ; then
G4LIB_BUILD_GDML=1
export G4LIB_BUILD_GDML
echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
fi
if [ X$g4lib_build_gdml = Xy ] ; then
XERCESCROOT=$g4gdml_xercesc_root
export XERCESCROOT
echo "On this machine the XERCESCROOT=\$XERCESCROOT"
fi
#
# Use G3TOG4 module
#
@@ -669,10 +758,20 @@ echo ''
if [ $LD_LIBRARY_PATH ] ; then
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
if [ $G4LIB_BUILD_GDML ] ; then
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
fi
export LD_LIBRARY_PATH
else
LD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
if [ $G4LIB_BUILD_GDML ] ; then
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
fi
export LD_LIBRARY_PATH
fi
fi
@@ -686,10 +785,20 @@ if [ $G4LIB_BUILD_SHARED ] ; then
if [ $DYLD_LIBRARY_PATH ] ; then
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
if [ $G4LIB_BUILD_GDML ] ; then
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
fi
export DYLD_LIBRARY_PATH
else
DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
if [ $G4LIB_BUILD_GDML ] ; then
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
fi
export DYLD_LIBRARY_PATH
fi
fi
+79
View File
@@ -39,12 +39,14 @@ unset G4LEDATA
unset G4LEVELGAMMADATA
unset G4NEUTRONHPDATA
unset G4RADIOACTIVEDATA
unset G4ABLADATA
unset G4LIB
unset G4LIB_BUILD_G3TOG4
unset G4LIB_BUILD_SHARED
unset G4LIB_BUILD_STATIC
unset G4LIB_BUILD_ZLIB
unset G4LIB_BUILD_GDML
unset G4LIB_USE_G3TOG4
unset G4LIB_USE_GRANULAR
unset G4LIB_USE_ZLIB
@@ -54,10 +56,12 @@ unset G4SYSTEM
unset G4UI_BUILD_WIN32_SESSION
unset G4UI_BUILD_XAW_SESSION
unset G4UI_BUILD_XM_SESSION
unset G4UI_BUILD_QT_SESSION
unset G4UI_USE_TCSH
unset G4UI_USE_WIN32
unset G4UI_USE_XAW
unset G4UI_USE_XM
unset G4UI_USE_QT
unset G4VIS_BUILD_DAWN_DRIVER
unset G4VIS_BUILD_OIWIN32_DRIVER
@@ -67,6 +71,7 @@ unset G4VIS_BUILD_OPENGLXM_DRIVER
unset G4VIS_BUILD_OPENGLX_DRIVER
unset G4VIS_BUILD_RAYTRACERX_DRIVER
unset G4VIS_BUILD_VRML_DRIVER
unset G4VIS_BUILD_OPENGLQT_DRIVER
unset G4VIS_USE_DAWN
unset G4VIS_USE_OIWIN32
@@ -76,6 +81,7 @@ unset G4VIS_USE_OPENGLX
unset G4VIS_USE_OPENGLXM
unset G4VIS_USE_RAYTRACERX
unset G4VIS_USE_VRML
unset G4VIS_USE_OPENGLQT
######################################
#
@@ -149,6 +155,16 @@ export G4NEUTRONHPDATA
echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
fi
#+
if [ X$g4abladata != X ] ; then
G4ABLADATA="$g4abladata"
export G4ABLADATA
echo "On this machine the G4ABLADATA=\$G4ABLADATA"
fi
#+
#if [ X$g4elasticdata != X ] ; then
#G4ELASTICDATA="$g4elasticdata"
@@ -257,6 +273,22 @@ export G4UI_USE_WIN32
echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
fi
#+
if [ X$g4ui_build_qt_session = Xy ] ; then
G4UI_BUILD_QT_SESSION=1
export G4UI_BUILD_QT_SESSION
echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
fi
#+
if [ X$g4ui_use_qt = Xy ] ; then
G4UI_USE_QT=1
export G4UI_USE_QT
echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
fi
#
# g4vis
#
@@ -316,6 +348,14 @@ export G4VIS_BUILD_VRML_DRIVER
echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
fi
#+
if [ X$g4vis_build_openglqt_driver = Xy ] ; then
G4VIS_BUILD_OPENGLQT_DRIVER=1
export G4VIS_BUILD_OPENGLQT_DRIVER
echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
fi
#+
if [ X$g4vis_use_dawn = Xy ] ; then
G4VIS_USE_DAWN=1
@@ -372,6 +412,19 @@ export G4VIS_USE_VRML
echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
fi
#+
if [ X$g4vis_use_openglqt = Xy ] ; then
G4VIS_USE_OPENGLQT=1
export G4VIS_USE_OPENGLQT
echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
fi
#+
if [ X$g4vis_oglhome != X ] ; then
OGLHOME="$g4vis_oglhome"
@@ -388,6 +441,14 @@ echo "On this machine the OIVHOME=\$OIVHOME"
fi
fi
#+
if [ X$g4_qthome != X ] ; then
QTHOME=$g4_qthome
export QTHOME
echo "On this machine the QTHOME=\$QTHOME"
fi
#+
if [ X$g4vis_build_openglxm_driver != X ] ; then
XMFLAGS="$g4vis_xmflags"
@@ -442,6 +503,24 @@ echo "On this machine the XAWLIBS=\$XAWLIBS"
fi
fi
#
# Use GDML module
#
#+
if [ X$g4lib_build_gdml = Xy ] ; then
G4LIB_BUILD_GDML=1
export G4LIB_BUILD_GDML
echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
fi
if [ X$g4lib_build_gdml = Xy ] ; then
XERCESCROOT=$g4gdml_xercesc_root
export XERCESCROOT
echo "On this machine the XERCESCROOT=\$XERCESCROOT"
fi
#
# Use G3TOG4 module
#
+71
View File
@@ -94,6 +94,15 @@ export G4NEUTRONHPDATA
echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
fi
#+
if [ X$g4abladata != X ] ; then
G4ABLADATA="$g4abladata"
export G4ABLADATA
echo "On this machine the G4ABLADATA=\$G4ABLADATA"
fi
#+
#if [ X$g4elasticdata != X ] ; then
#G4ELASTICDATA="$g4elasticdata"
@@ -196,6 +205,23 @@ export G4UI_USE_WIN32
echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
fi
#+
if [ X$g4ui_build_qt_session = Xy ] ; then
G4UI_BUILD_QT_SESSION=1
export G4UI_BUILD_QT_SESSION
echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
fi
#+
if [ X$g4ui_use_qt = Xy ] ; then
G4UI_USE_QT=1
export G4UI_USE_QT
echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
fi
#
# g4vis
#
@@ -248,6 +274,15 @@ export G4VIS_BUILD_VRML_DRIVER
echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
fi
#+
if [ X$g4vis_build_openglqt_driver = Xy ] ; then
G4VIS_BUILD_OPENGLQT_DRIVER=1
export G4VIS_BUILD_OPENGLQT_DRIVER
echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
fi
#+
if [ X$g4vis_use_dawn = Xy ] ; then
G4VIS_USE_DAWN=1
@@ -297,6 +332,15 @@ export G4VIS_USE_VRML
echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
fi
#+
if [ X$g4vis_use_openglqt = Xy ] ; then
G4VIS_USE_OPENGLQT=1
export G4VIS_USE_OPENGLQT
echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
fi
#+
if [ X$g4vis_oglhome != X ] ; then
OGLHOME="$g4vis_oglhome"
@@ -304,6 +348,33 @@ export OGLHOME
echo "On this machine the OGLHOME=\$OGLHOME"
fi
#+
if [ X$g4_qthome != X ] ; then
QTHOME=$g4_qthome
export QTHOME
echo "On this machine the QTHOME=\$QTHOME"
fi
#
# Use GDML module
#
#+
if [ X$g4lib_build_gdml = Xy ] ; then
G4LIB_BUILD_GDML=1
export G4LIB_BUILD_GDML
echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
fi
if [ X$g4lib_build_gdml = Xy ] ; then
XERCESCROOT=$g4gdml_xercesc_root
export XERCESCROOT
echo "On this machine the XERCESCROOT=\$XERCESCROOT"
fi
#
# Use G3TOG4 module
#
+14 -1
View File
@@ -27,7 +27,7 @@ ifeq ($(G4SYSTEM),Darwin-g++)
FCFLAGS += -pg
CCFLAGS += -pg
endif
FC := g77
FC := gfortran
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
LDFLAGS += -bind_at_load
FCLIBS := -lg2c -lnsl
@@ -46,6 +46,19 @@ ifeq ($(G4SYSTEM),Darwin-g++)
XMLIBS := -L/sw/lib -lXm -lXpm
# 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
MOC := $(QTHOME)/bin/moc
endif
ifndef QTLIBS
QT3LIBS := -L$(QTHOME)/lib -lqt-mt -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
# XAWFLAGS := -I/usr/X11R6/include ##### some installations.
+13
View File
@@ -54,6 +54,19 @@ ifeq ($(G4SYSTEM),Linux-g++)
ifndef XMLIBS
XMLIBS := -lXm -lXpm
endif
ifndef QTHOME
QTHOME := /usr/local/Qt
endif
ifndef QTFLAGS
QTFLAGS := -I$(QTHOME)/include/Qt
QTFLAGS += -I$(QTHOME)/include
MOC := $(QTHOME)/bin/moc
endif
ifndef QTLIBS
QT3LIBS := -L$(QTHOME)/lib -lqt-mt
QT4LIBS := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
QTLIBS := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS))
endif
ifndef XAWFLAGS
XAWFLAGS := -I/usr/X11R6/include
endif
+1 -1
View File
@@ -4,7 +4,7 @@
ifeq ($(G4SYSTEM),SUN-CC)
CXX := CC
ifdef G4OPTIMISE
CXXFLAGS := -O
CXXFLAGS := -xO2
else
ifdef G4DEBUG
CXXFLAGS := -g
+2 -2
View File
@@ -80,7 +80,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
/libpath:$(G4LIBDIR) $(GLOBLIBS) \
$(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
$(INTYLIBS) $(ANALYSISLIBS) $(UI32LIBS)
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS)
endef
define build-global-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`;\
@@ -103,6 +103,6 @@ ifeq ($(G4SYSTEM),WIN32-VC)
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
/libpath:$(G4LIBDIR) $(GLOBLIBS) \
$(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
$(INTYLIBS) $(ANALYSISLIBS) $(UI32LIBS)
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS)
endef
endif