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

Import Geant4 10.7.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2020-06-26 10:23:25 +02:00
parent c02c370437
commit 67ba86d073
1871 changed files with 174422 additions and 131884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/G4UI_BUILD.gmk
+4 -1
View File
@@ -19,10 +19,13 @@ ifdef G4VIS_BUILD_OPENGLXM_DRIVER
G4INTY_BUILD_XT = 1
endif
# Special case: if OIX vis driver requested, G4Xt must be built.
# Special case: if OIX/OIQt vis driver requested, G4Xt/G4Qt must be built.
ifdef G4VIS_BUILD_OIX_DRIVER
G4INTY_BUILD_XT = 1
endif
ifdef G4VIS_BUILD_OIQT_DRIVER
G4INTY_BUILD_QT = 1
endif
ifdef G4UI_BUILD_XM_SESSION
G4UI_BUILD_BASIC_SESSION = 1
config/G4VIS_BUILD.gmk
+4 -2
View File
@@ -25,7 +25,7 @@ ifdef G4VIS_BUILD_OPENGLXM_DRIVER
# OPENGLXM requires OPENGLX...
G4VIS_BUILD_OPENGLX_DRIVER = 1
G4INTY_BUILD_XT = 1
INC_XM = 1
INC_XM = 1
CPPFLAGS += -DG4VIS_BUILD_OPENGLXM_DRIVER
endif
ifdef G4VIS_BUILD_OPENGLQT_DRIVER
@@ -60,11 +60,13 @@ endif
ifdef G4VIS_BUILD_OIX_DRIVER
G4VIS_BUILD_OI_DRIVER = 1
G4INTY_BUILD_XT = 1
INC_XM = 1
CPPFLAGS += -DG4VIS_BUILD_OIX_DRIVER
endif
ifdef G4VIS_BUILD_OIQT_DRIVER
G4VIS_BUILD_OI_DRIVER = 1
G4INTY_BUILDQT = 1
G4INTY_BUILD_QT = 1
INC_QT = 1
CPPFLAGS += -DG4VIS_BUILD_OIQT_DRIVER
endif
ifdef G4VIS_BUILD_OIWIN32_DRIVER
config/History
+21 -1
View File
@@ -15,9 +15,29 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
12th Feb 2020 Gabriele Cosmo (config-V10-05-09)
22nd June 2020 Gabriele Cosmo (config-V10-06-06)
- Added -pthread to all builds in Linux targets.
18th June 2020 Gabriele Cosmo (config-V10-06-05)
- Added setup for building and configuring new externals/ptl
and tasking modules. External installation of PTL can be enabled
by defining the installation through the environment variable PTL_BASE_DIR.
25th May 2020 Gabriele Cosmo (config-V10-06-04)
- Added missing settings in G4UI_BUILD.gmk script for OIQt and use of UI.
18th May 2020 Gabriele Cosmo (config-V10-06-03)
- Removed deprecated G4USE_STD11 flag settings.
30th Apr 2020 Gabriele Cosmo (config-V10-06-02)
- Corrected setup for use of OpenInventor (Coin).
12th Feb 2020 Gabriele Cosmo (config-V10-06-01)
- Fixed and updated setup for DLL builds on Windows.
12th Dec 2019 Gabriele Cosmo (config-V10-06-00)
- Removed dependency on GLU for all configurations, as no longer necessary.
20th Nov 2019 Gabriele Cosmo (config-V10-05-08)
- interactivity.gmk: added -DQT_NO_DEPRECATED_WARNINGS to Qt compilation
settings, to silence warnings from Qt for use of deprecated features.
config/architecture.gmk
+47 -10
View File
@@ -131,10 +131,10 @@ ifndef G4BIN
endif
G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4BIN) ] && mkdir -p $(G4BIN) )
# Use C++11 standard constructs and compilation options ...
# Use minimum C++14 standard constructs and compilation options ...
#
CPPFLAGS += -DG4USE_STD11
G4USE_STD11 := 1
# CPPFLAGS += -DG4USE_STD14
# G4USE_STD14 := 1
# If G4DEBUG or G4NO_OPTIMISE are not specified,
# the default compilation is optimised ...
@@ -181,6 +181,29 @@ ifndef CLHEP_LIB_DIR
CLHEP_LIB_DIR := $(CLHEP_BASE_DIR)/lib
endif
# PTL path, etc.
#
ifndef PTL_BASE_DIR
PTL_BASE_DIR := $(G4BASE)/externals/ptl
G4LIB_BUILD_PTL := 1
G4LIB_USE_PTL := 1
endif
ifndef G4LIB_USE_PTL
ifndef PTL_LIB
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
PTL_LIB := ptl.lib
else
PTL_LIB := ptl
endif
endif
endif
ifndef PTL_INCLUDE_DIR
PTL_INCLUDE_DIR := $(PTL_BASE_DIR)/include
endif
ifndef CLHEP_LIB_DIR
PTL_LIB_DIR := $(PTL_BASE_DIR)/lib
endif
# USolids path, etc.
#
ifdef G4GEOM_USE_USOLIDS
@@ -256,7 +279,7 @@ endif
# Variables for implicit rules, etc., as suggested in GNU Make manual...
#
CPPFLAGS += -Iinclude
CPPFLAGS += -I$(CLHEP_INCLUDE_DIR)
CPPFLAGS += -I$(CLHEP_INCLUDE_DIR) -I$(PTL_INCLUDE_DIR)
# Positional qualifiers in action...
#
@@ -280,6 +303,15 @@ ifndef G4LIB_USE_CLHEP
LOADLIBS += -l$(CLHEP_LIB)
endif
endif
ifndef G4LIB_USE_PTL
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
LDFLAGS += -link $(LIB_PATH)$(PTL_LIB_DIR)
LOADLIBS += $(PTL_LIB)
else
LDFLAGS += -L$(PTL_LIB_DIR)
LOADLIBS += -l$(PTL_LIB)
endif
endif
ifdef G4LIB_USE_USOLIDS
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
LDFLAGS += -link $(LIB_PATH)$(USOLIDS_LIB_DIR)
@@ -340,8 +372,8 @@ endif
# OGLFLAGS gives the directory containing include files.
# E.g.: OGLFLAGS := -I$(OGLHOME)/include
# OGLLIBS gives the libraries.
# E.g.: OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
# Or : OGLLIBS := -L$(OGLHOME)/lib -lMesaGLU -lMesaGL
# E.g.: OGLLIBS := -L$(OGLHOME)/lib -lGL
# Or : OGLLIBS := -L$(OGLHOME)/lib -lMesaGL
# OGLHOME is often /usr or /usr/local. In such case, it is not necessary
# to specify the path in OGLFLAGS, since added already by default by the
# compiler. OGLHOME can also point to a special installation.
@@ -349,18 +381,23 @@ endif
# are set below. Most system-dependent code assumes OGLHOME is set.
# ------------- OpenInventor -----------------
# The path to the installation of OpenInventor must be specified
# The path to the installation of OpenInventor (Coin) must be specified
# if the package is installed in a location different
# than default system directories (like... /usr or /usr/local).
#
ifndef OIVHOME
OIVHOME := /usr/local/Inventor
OIVHOME := /usr/local/Inventor
endif
ifndef OIVFLAGS
OIVFLAGS := -I$(OIVHOME)/include
OIVFLAGS := -I$(OIVHOME)/include
endif
ifndef OIVLIBS
OIVLIBS := -L$(OIVHOME)/lib -lInventorXt -lInventor
ifdef G4VIS_USE_OIQT
OIVLIBS := -L$(OIVHOME)/lib -lSoQt
else
OIVLIBS := -L$(OIVHOME)/lib -lSoXt
endif
OIVLIBS += -lCoin
endif
# ----------------- GDML ---------------------
config/binmake.gmk
+6
View File
@@ -157,6 +157,7 @@ ifndef INCFLAGS
-I$(G4BASE)/geometry/navigation/include \
-I$(G4BASE)/geometry/magneticfield/include \
-I$(G4BASE)/geometry/biasing/include \
-I$(G4BASE)/tasking/include \
-I$(G4BASE)/track/include \
-I$(G4BASE)/tracking/include \
-I$(G4BASE)/digits_hits/detector/include \
@@ -238,6 +239,7 @@ ifdef GLOBALLIBS
LDLIBS2 += -lG4error_propagation \
-lG4readout \
-lG4physicslists \
-lG4tasking \
-lG4run \
-lG4event \
-lG4tracking \
@@ -257,6 +259,10 @@ ifdef GLOBALLIBS
LDLIBS2 += -lG4clhep
endif
ifdef G4LIB_USE_PTL
LDLIBS2 += -lG4ptl
endif
ifdef G4LIB_USE_EXPAT
LDLIBS2 += -lG4expat
endif
config/sys/AIX-xlC.gmk
+1 -1
View File
@@ -40,7 +40,7 @@ ifeq ($(G4SYSTEM),AIX-xlC)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
define build-granular-shared-lib
config/sys/DEC-cxx.gmk
+2 -2
View File
@@ -42,8 +42,8 @@ ifeq ($(G4SYSTEM),DEC-cxx)
# OGLFLAGS := -I/usr/include -I/usr/local/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
# OGLLIBS := -lMesaGLU -lMesaGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
# OGLLIBS := -lMesaGL
endif
define build-granular-shared-lib
config/sys/Darwin-clang.gmk
+1 -2
View File
@@ -11,7 +11,6 @@ ifeq ($(G4SYSTEM),Darwin-clang)
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
CPPFLAGS += -DGL_SILENCE_DEPRECATION
G4USE_STD11 := 1
ifdef G4USE_STD14
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
@@ -92,7 +91,7 @@ ifeq ($(G4SYSTEM),Darwin-clang)
ifneq ($(OGLPATH),)
OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL
else
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
endif
config/sys/Darwin-g++.gmk
+3 -4
View File
@@ -14,7 +14,6 @@ ifeq ($(G4SYSTEM),Darwin-g++)
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
CPPFLAGS += -DGL_SILENCE_DEPRECATION
G4USE_STD11 := 1
ifdef G4USE_STD14
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
@@ -100,7 +99,7 @@ ifeq ($(G4SYSTEM),Darwin-g++)
ifneq ($(OGLPATH),)
OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL
else
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
endif
ifndef OGLLIBS
@@ -112,13 +111,13 @@ ifeq ($(G4SYSTEM),Darwin-g++)
DARWIN_VERSION = $(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/')
ifeq ($(DARWIN_VERSION),9)
# the following lines are for building on MacOSX 10.5 "Leopard"
OGLLIBS := -Wl,$(OGLPATH)/Libraries/libGL.dylib -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -Wl,$(OGLPATH)/Libraries/libGL.dylib -L$(OGLHOME)/lib -lGL
else
# the following lines are for building on MacOSX > 10.5
OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL
endif
else
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
endif
config/sys/HP-aCC.gmk
+1 -1
View File
@@ -48,7 +48,7 @@ ifeq ($(G4SYSTEM),HP-aCC)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
OGLLIBS += -L/opt/graphics/common/lib -lXwindow -lhpgfx -lXhp11 -ldld
endif
config/sys/Linux-clang.gmk
+3 -4
View File
@@ -7,9 +7,8 @@ ifeq ($(G4SYSTEM),Linux-clang)
CXX := clang++
CXXFLAGS := -Wall -Wno-non-virtual-dtor -Wno-long-long
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe -pthread
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
G4USE_STD11 := 1
ifdef G4USE_STD14
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
@@ -23,7 +22,7 @@ ifeq ($(G4SYSTEM),Linux-clang)
endif
endif
ifdef G4MULTITHREADED
CXXFLAGS += -ftls-model=initial-exec -pthread
CXXFLAGS += -ftls-model=initial-exec
endif
ifdef G4OPTIMISE
CXXFLAGS += -O3
@@ -88,7 +87,7 @@ ifeq ($(G4SYSTEM),Linux-clang)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib$(ARCH) -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib$(ARCH) -lGL
endif
# ---- QT Setup block -------------------------------------------------------
config/sys/Linux-g++.gmk
+3 -4
View File
@@ -5,9 +5,8 @@ ifeq ($(G4SYSTEM),Linux-g++)
CXX := g++
CXXFLAGS := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe -pthread
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
G4USE_STD11 := 1
ifdef G4USE_STD14
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
@@ -21,7 +20,7 @@ ifeq ($(G4SYSTEM),Linux-g++)
endif
endif
ifdef G4MULTITHREADED
CXXFLAGS += -ftls-model=initial-exec -pthread
CXXFLAGS += -ftls-model=initial-exec
endif
ifdef G4OPTIMISE
CXXFLAGS += -O3
@@ -86,7 +85,7 @@ ifeq ($(G4SYSTEM),Linux-g++)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib$(ARCH) -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib$(ARCH) -lGL
endif
# ---- QT Setup block -------------------------------------------------------
config/sys/Linux-icc.gmk
+3 -5
View File
@@ -3,8 +3,7 @@
#
ifeq ($(G4SYSTEM),Linux-icc)
CXX := icc
CXXFLAGS := -ansi -fp-model precise -w1
G4USE_STD11 := 1
CXXFLAGS := -ansi -fp-model precise -w1 -pthread
ifdef G4USE_STD14
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
@@ -18,7 +17,7 @@ ifeq ($(G4SYSTEM),Linux-icc)
endif
endif
ifdef G4MULTITHREADED
CXXFLAGS += -ftls-model=initial-exec -pthread
CXXFLAGS += -ftls-model=initial-exec
endif
ifdef G4OPTIMISE
CXXFLAGS += -O3
@@ -51,7 +50,6 @@ 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
@@ -78,7 +76,7 @@ ifeq ($(G4SYSTEM),Linux-icc)
OGLHOME := /usr
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
define build-granular-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \
config/sys/SGI-CC.gmk
+1 -1
View File
@@ -40,7 +40,7 @@ ifeq ($(G4SYSTEM),SGI-CC)
OGLFLAGS :=
endif
ifndef OGLLIBS
OGLLIBS := -L/usr/lib -lGLU -lGL
OGLLIBS := -L/usr/lib -lGL
endif
define build-granular-shared-lib
config/sys/SUN-CC.gmk
+1 -1
View File
@@ -50,7 +50,7 @@ ifeq ($(G4SYSTEM),SUN-CC)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
LOADLIBS += -lsunmath -lsocket -lnsl
config/sys/WIN32-VC.gmk
+6 -1
View File
@@ -33,7 +33,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
OGLFLAGS :=
endif
ifndef OGLLIBS
OGLLIBS := glu32.lib opengl32.lib gdi32.lib user32.lib
OGLLIBS := opengl32.lib gdi32.lib user32.lib
endif
ifndef UI32LIBS
UI32LIBS := gdi32.lib user32.lib
@@ -85,6 +85,9 @@ ifeq ($(G4SYSTEM),WIN32-VC)
ifdef G4LIB_USE_CLHEP
GLOBLIBS += libG4clhep.lib
endif
ifdef G4LIB_USE_PTL
GLOBLIBS += libptl.lib
endif
define build-granular-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`;\
cd $(G4TMP)/$(G4SYSTEM);\
@@ -102,6 +105,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
$(LIB_PATH)$(G4LIBDIR) $(GLOBLIBS) \
$(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
$(LIB_PATH)$(PTL_LIB_DIR) $(PTL_LIB) \
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS) $(LOADLIBS)
endef
define build-global-shared-lib
@@ -121,6 +125,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
$(LIB_PATH)$(G4LIBDIR) $(GLOBLIBS) \
$(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
$(LIB_PATH)$(PTL_LIB_DIR) $(PTL_LIB) \
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS) $(LOADLIBS)
endef
endif
config/sys/WIN32-g++.gmk
+1 -2
View File
@@ -9,7 +9,6 @@ ifeq ($(G4SYSTEM),WIN32-g++)
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
G4USE_STD11 := 1
G4USE_STD17 := 1
CPPFLAGS += -std=c++17
CXXFLAGS += -std=c++17
@@ -74,7 +73,7 @@ ifeq ($(G4SYSTEM),WIN32-g++)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
define build-granular-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \