lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 9.6.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 17:01:34 +02:00
parent b1eb5424d2
commit e2d2f9810a
10384 changed files with 698580 additions and 628834 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/History
+44
View File
@@ -16,6 +16,50 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
4th October 2012 Gabriele Cosmo (config-V09-05-12, config-V09-05-11)
- binmake.gmk: replaced "photolepton_hadron" module with "lepto_nuclear".
- Cowork with tag "hadr-V09-05-00".
23rd August 2012 Gabriele Cosmo (config-V09-05-10)
- Updated paths for X11 in X11FLAGS on Darwin targets, for porting on
MacOSX 10.8.
9th July 2012 Alberto Ribon (config-V09-05-09)
- Removed INCL package: processes/hadronic/models/incl .
22th May 2012 Garnier Laurent (config-V09-05-08)
- fix moc.gmk generation in order to generate moc in G4TMP dir
2nd May 2012 Gunter Folger
- revert changes by Mikhail (rev r58246)
27th April 2012 Mikhail Kosov (config-V09-05-07)
- hadronic/model/chiral_inv_phase_space moved to hadronic/chips
5th April 2012 Gabriele Cosmo (config-V09-05-06)
- Exclude "setup" and "clean_setup" targets from dependencies step.
16th February 2012 Gabriele Cosmo (config-V09-05-05)
- Moved basic "-lm -lstdc++" link options in LOADLIBS within platform specific
configuration scripts. Avoid using "-lm" on Linux-icc platform.
2nd February 2012 Gabriele Cosmo (config-V09-05-04)
- Corrected debug compilation option in WIN32-VC, to use -MDd instead of -MD.
27th January 2012 Gunter Folger (config-V09-05-03)
- For WIN32-VC increase stack size of executable to 12Mb.
9th December 2011 Gabriele Cosmo (config-V09-05-02)
- Corrected condition for determining QT_AS_FRAMEWORK flag depending on
how QTHOME is defined in Darwin setups. Addresses problem report #1267.
8th December 2011 Gabriele Cosmo (config-V09-05-01)
- Added Darwin-clang experimental configuration. Requires explicit addition
of -lstdc++ to LDLIBS in architecture.gmk.
8th December 2011 Gabriele Cosmo (config-V09-05-00)
- Removed unnecessary 'gcov' linkage for dynamic libraries in Darwin-g++.gmk.
22nd November 2011 Gabriele Cosmo (config-V09-04-19)
- Corrected path in Darwin-g++ setup introduced in previous tag.
config/architecture.gmk
+3 -11
View File
@@ -15,10 +15,10 @@
#
# Linux-g++ Linux (Red Hat Enterprise/SCL5), gcc-4.1.2 (default)
#
# Darwin-g++ MacOSX 10.6, gcc-4.2.1
# Darwin-g++ MacOSX 10.7, gcc-4.2.1
#
# WIN32-VC Windows/XP and Microsoft Visual C++ 9.0
# Adding CYGWIN32 tools
# WIN32-VC Windows 7 and Microsoft Visual C++ 10.0
#
# -------------------------------------------------------------------------
MAKEFLAGS= --no-print-directory
@@ -240,7 +240,6 @@ ifeq (,$(findstring WIN32-VC,$(G4SYSTEM)))
ifndef G4LIB_USE_ZLIB
LOADLIBS += -lz
endif
LOADLIBS += -lm
endif
# Graphic variables...
@@ -400,10 +399,3 @@ ifdef CFRONT
G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4TREP) ] && mkdir -p $(G4TREP) )
G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4TREP)/exec ] &&mkdir -p $(G4TREP)/exec )
endif
# If G4SYSTEM is not specified or not valid, issue an ERROR !
#
#$(G4INSTALL)/config/sys/$(G4SYSTEM).gmk:
# @echo "ERROR - G4SYSTEM is not defined in the environment"
# @echo " or $(G4SYSTEM) architecture is not a valid one !"
# exit 1
config/binmake.gmk
+5 -2
View File
@@ -112,7 +112,6 @@ ifndef INCFLAGS
-I$(G4BASE)/processes/hadronic/models/em_dissociation/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/inclxx/interface/include \
-I$(G4BASE)/processes/hadronic/models/inclxx/utils/include \
-I$(G4BASE)/processes/hadronic/models/inclxx/incl_physics/include \
@@ -126,7 +125,7 @@ ifndef INCFLAGS
-I$(G4BASE)/processes/hadronic/models/parton_string/hadronization/include \
-I$(G4BASE)/processes/hadronic/models/parton_string/management/include \
-I$(G4BASE)/processes/hadronic/models/parton_string/qgsm/include \
-I$(G4BASE)/processes/hadronic/models/photolepton_hadron/muon_nuclear/include \
-I$(G4BASE)/processes/hadronic/models/lepto_nuclear/include \
-I$(G4BASE)/processes/hadronic/models/pre_equilibrium/exciton_model/include \
-I$(G4BASE)/processes/hadronic/models/qmd/include \
-I$(G4BASE)/processes/hadronic/models/quasi_elastic/include \
@@ -440,9 +439,13 @@ $(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc
[ -s $@ ] || rm -f $@
ifneq ($(dependencies),)
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),setup)
ifneq ($(MAKECMDGOALS),clean_setup)
-include $(dependencies)
endif
endif
endif
endif
clean::
@echo Cleaning up ...
config/common.gmk
+4
View File
@@ -119,9 +119,13 @@ $(G4TMPDIR)/%.d: src/%.cc
[ -s $@ ] || rm -f $@
ifneq ($(dependencies),)
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),setup)
ifneq ($(MAKECMDGOALS),clean_setup)
-include $(dependencies)
endif
endif
endif
endif
#
# Installation of include files
config/sys/AIX-xlC.gmk
+1
View File
@@ -17,6 +17,7 @@ ifeq ($(G4SYSTEM),AIX-xlC)
FCFLAGS += -qextname
FCLIBS := -lxlf90 -lxlf
SHEXT := so
LOADLIBS += -lm -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
endif
config/sys/DEC-cxx.gmk
+1
View File
@@ -18,6 +18,7 @@ ifeq ($(G4SYSTEM),DEC-cxx)
G4RUNPATHOPTION := -rpath
FC := f77
FCLIBS := -lUfor -lfor -lFutil -lots
LOADLIBS += -lm -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
endif
config/sys/Darwin-clang.gmk
+146
View File
@@ -0,0 +1,146 @@
#
# ------ MacOS-X ------
# MacOS 10.7 clang-3.0
#
# Original author: Gabriele Cosmo - CERN
#
ifeq ($(G4SYSTEM),Darwin-clang)
CXX := clang
CXXFLAGS := -Wall -pedantic -Wno-non-virtual-dtor -Wno-long-long
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
ifdef G4OPTIMISE
CXXFLAGS += -O2
FCFLAGS := -O2
CCFLAGS := -O2
else
ifdef G4DEBUG
CXXFLAGS += -g
FCFLAGS := -g
CCFLAGS := -g
endif
endif
ifdef G4PROFILE
CXXFLAGS += -pg
FCFLAGS += -pg
CCFLAGS += -pg
endif
ifdef G4OPTDEBUG
CXXFLAGS += -O2 -g
FCFLAGS += -O2 -g
CCFLAGS += -O2 -g
endif
FC := gfortran
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
LDFLAGS += -bind_at_load
FCLIBS := -lg2c -lnsl
SHEXT := dylib
LOADLIBS += -lm -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/X11R6/include/X11/extensions -I/usr/X11R6/include/X11
endif
ifndef X11LIBS
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
endif
ifndef XMFLAGS
XMFLAGS := -I/sw/include
# XMFLAGS := -I/usr/X11R6/include ##### some installations.
endif
ifndef XMLIBS
XMLIBS := -L/sw/lib -lXm -lXpm
# XMLIBS := -L/usr/X11R6/lib -lXm -lXpm ##### some installations.
endif
ifndef XAWFLAGS
XAWFLAGS := -I/sw/include
# XAWFLAGS := -I/usr/X11R6/include ##### some installations.
endif
ifndef XAWLIBS
XAWLIBS := -lXaw
endif
DLDLIBS := -ldl
ifndef OGLHOME
OGLHOME := /usr/X11R6
endif
ifndef OGLFLAGS
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
QTGLPATH := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
ifeq ($(QTGLPATH),/System/Library/Frameworks/OpenGL.framework)
OGLLIBS := -F/System/Library/Frameworks -framework OpenGL -framework AGL
ifeq ($(G4VIS_USE_OPENGLX),1)
OGLLIBS += -L$(OGLHOME)/lib -lGLU -lGL
endif
else
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
endif
endif
# ---- Qt Setup block -------------------------------------------------------
ifndef QTHOME
QTHOME := /Library/Frameworks
endif
ifndef QTMOC
ifeq ($(QTHOME),/Library/Frameworks)
QTMOC := /usr/bin/moc
else
QTMOC := $(QTHOME)/bin/moc
endif
endif
ifndef QTFLAGS
QTFLAGS := -I $(QTHOME)/QtCore.framework/Headers
QTFLAGS += -I $(QTHOME)/QtGui.framework/Headers
QTFLAGS += -I $(QTHOME)/QtOpenGL.framework/Headers
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
endif
ifndef QTLIBPATH
ifeq ($(QTHOME),/Library/Frameworks)
QTLPATH := $(QTHOME)
else
QTLPATH := $(QTHOME)/lib
endif
QTLIBPATH := -F$(QTLPATH)
endif
QT_AS_FRAMEWORK := $(shell test -d $(QTLPATH)/QtCore.framework && echo yes)
ifndef QTLIBS
ifdef QT_AS_FRAMEWORK
QTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
else
QTLIBS := -L$(QTLPATH) -lQtCore -lQtGui
endif
endif
ifndef GLQTLIBS
ifdef QT_AS_FRAMEWORK
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
GLQTLIBS += -framework QtOpenGL
else
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
endif
endif
#------ Wt Setup block ------------------------------------------------------
ifndef WTHOME
WTHOME := /usr
endif
WTFLAGS := -I$(WTHOME)/include/boost -I$(WTHOME)/include -DQT_NO_KEYWORDS
WTLIBS := -L$(WTHOME)/lib -lwt -lwtext -lwthttp -lboost_signals -L/usr/lib -lz -lssl -lcrypto
#----------------------------------------------------------------------------
define build-granular-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \
cd $(G4TMPDIR); \
$(CXX) -dynamiclib -single_module -undefined dynamic_lookup \
-o $$libdir/$(@F) $(INTYLIBS) *.o
endef
define build-global-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \
cd $(G4TMP)/$(G4SYSTEM); \
$(CXX) -dynamiclib -single_module -undefined dynamic_lookup \
-o $$libdir/$(@F) $(INTYLIBS) $(foreach dir,$(SUBLIBS),$(dir)/*.o);
endef
endif
config/sys/Darwin-g++.gmk
+11 -9
View File
@@ -1,6 +1,6 @@
#
# ------ MacOS-X ------
# MacOS 10.6 gcc-4.2
# MacOS 10.7 gcc-4.2
#
# Original author: Helmut Burkhardt - CERN
# Revisions: Guy Barrand - LAL
@@ -38,8 +38,9 @@ ifeq ($(G4SYSTEM),Darwin-g++)
LDFLAGS += -bind_at_load -arch_multiple
FCLIBS := -lg2c -lnsl
SHEXT := dylib
LOADLIBS += -lm -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
X11FLAGS := -I/usr/X11R6/include/X11/extensions -I/usr/X11R6/include/X11
endif
ifndef X11LIBS
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
@@ -107,19 +108,20 @@ ifeq ($(G4SYSTEM),Darwin-g++)
endif
ifndef QTLIBPATH
ifeq ($(QTHOME),/Library/Frameworks)
QTLIBPATH := -F$(QTHOME)
QTLPATH := $(QTHOME)
else
QTLIBPATH := -F$(QTHOME)/lib
QTLPATH := $(QTHOME)/lib
endif
QTLIBPATH := -F$(QTLPATH)
endif
QT_AS_FRAMEWORK := $(shell test -d $(QTHOME)/lib/QtCore.framework && echo yes)
QT_AS_FRAMEWORK := $(shell test -d $(QTLPATH)/QtCore.framework && echo yes)
ifndef QTLIBS
ifdef QT_AS_FRAMEWORK
QTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
else
QTLIBS := -L$(QTHOME)/lib -lQtCore -lQtGui
QTLIBS := -L$(QTLPATH) -lQtCore -lQtGui
endif
endif
ifndef GLQTLIBS
@@ -127,7 +129,7 @@ ifeq ($(G4SYSTEM),Darwin-g++)
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
GLQTLIBS += -framework QtOpenGL
else
GLQTLIBS := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
endif
endif
@@ -144,13 +146,13 @@ ifeq ($(G4SYSTEM),Darwin-g++)
define build-granular-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \
cd $(G4TMPDIR); \
$(CXX) -dynamiclib -single_module -lgcov -undefined dynamic_lookup \
$(CXX) -dynamiclib -single_module -undefined dynamic_lookup \
-o $$libdir/$(@F) $(INTYLIBS) *.o
endef
define build-global-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \
cd $(G4TMP)/$(G4SYSTEM); \
$(CXX) -dynamiclib -single_module -lgcov -undefined dynamic_lookup \
$(CXX) -dynamiclib -single_module -undefined dynamic_lookup \
-o $$libdir/$(@F) $(INTYLIBS) $(foreach dir,$(SUBLIBS),$(dir)/*.o);
endef
config/sys/HP-aCC.gmk
+1
View File
@@ -24,6 +24,7 @@ ifeq ($(G4SYSTEM),HP-aCC)
SHEXT := sl
FCFLAGS += +E6 +ppu
CCFLAGS += -Ae +DAportable
LOADLIBS += -lm -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/include/X11/extensions -I/usr/contrib/X11R6/include
X11FLAGS += -I/usr/contrib/X11R6/include/X11
config/sys/Linux-egcs.gmk
+1
View File
@@ -31,6 +31,7 @@ ifeq ($(G4SYSTEM),Linux-egcs)
FCLIBS := -lg2c -lnsl
ECHO := /bin/echo -e
SHEXT := so
LOADLIBS += -lm -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
endif
config/sys/Linux-g++.gmk
+1 -1
View File
@@ -48,7 +48,7 @@ ifeq ($(G4SYSTEM),Linux-g++)
ECHO := /bin/echo -e
SHEXT := so
ARCH := $(shell uname -m | cut -s -d "_" -f 2)
LOADLIBS += -lm -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
endif
config/sys/Linux-icc.gmk
+1
View File
@@ -34,6 +34,7 @@ ifeq ($(G4SYSTEM),Linux-icc)
AR := ar r
ECHO := /bin/echo -e
SHEXT := so
LOADLIBS += -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
endif
config/sys/SGI-CC.gmk
+1
View File
@@ -17,6 +17,7 @@ ifeq ($(G4SYSTEM),SGI-CC)
FC := f77
FCLIBS := -lftn
SHEXT := so
LOADLIBS += -lm -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
endif
config/sys/SUN-CC.gmk
+1
View File
@@ -26,6 +26,7 @@ ifeq ($(G4SYSTEM),SUN-CC)
ECHO := /bin/echo
GREP := /usr/xpg4/bin/grep
FCLIBS := -lM77 -lF77 -lsunmath
LOADLIBS += -lm -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/openwin/include/X11/extensions -I/usr/openwin/include/X11
X11FLAGS += -I/usr/openwin/include
config/sys/WIN32-VC.gmk
+4 -4
View File
@@ -4,16 +4,16 @@
ifeq ($(G4SYSTEM),WIN32-VC)
CXX := CL
ifdef G4OPTIMISE
CXXFLAGS += -Ox
CXXFLAGS += -Ox -MD
else
ifdef G4DEBUG
CXXFLAGS += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
CXXFLAGS += -Od -MDd -Zi -Fd$(G4LIBDIR)/lib$(name)
endif
endif
CXXFLAGS += -MD -GR -EHsc -Zm200 -nologo
CXXFLAGS += -GR -EHsc -Zm200 -nologo
CXXFLAGS += -D_CONSOLE -D_WIN32 -DOS
CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE
LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll /STACK:8368128
LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll /STACK:12582912
SHEXT := dll
AR := LIB
config/sys/WIN32-g++.gmk
+1
View File
@@ -47,6 +47,7 @@ ifeq ($(G4SYSTEM),WIN32-g++)
FC := g77
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
FCLIBS := -lg2c -lnsl
LOADLIBS += -lm -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
endif