Import Geant4 11.0.0.beta source tree
This commit is contained in:
Gabriele Cosmo
+18
-3
@@ -15,10 +15,25 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
12th March 2021 Gabriele Cosmo (config-V10-06-09)
|
||||
- Fixed name of internal PTL module library for DLL build.
|
||||
1st June 2021 Gabriele Cosmo (config-V10-07-05)
|
||||
- Moved default to c++17 Standard.
|
||||
|
||||
11th December 2020 Gabriele Cosmo (config-V10-06-08)
|
||||
15th April 2021 Gabriele Cosmo (config-V10-07-04)
|
||||
- binmake.gmk: removed include paths to "hadronic/models/management" and
|
||||
"hadronic/models/util" modules, now retired.
|
||||
|
||||
17th March 2021 Gabriele Cosmo (config-V10-07-03)
|
||||
- binmake.gmk: removed include path to "rpg" hadronic model, now retired.
|
||||
|
||||
12th March 2021 Gabriele Cosmo (config-V10-07-02)
|
||||
- Added comctl32.lib to UI32LIBS for WIN32-VC configuration and fixed name
|
||||
of internal PTL module library for DLL build.
|
||||
|
||||
18th December 2020 Ben Morgan (config-V10-07-01)
|
||||
- Update compiler/link flags for migration of g4tools to externals
|
||||
category.
|
||||
|
||||
11th December 2020 Gabriele Cosmo (config-V10-07-00)
|
||||
- Updated Qt5 settings in Linux targets.
|
||||
|
||||
22nd October 2020 Gabriele Cosmo (config-V10-06-07)
|
||||
|
||||
+10
-11
@@ -37,14 +37,14 @@ ifndef SHAREDLIBS
|
||||
endif
|
||||
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
|
||||
SHAREDLIBS := $(shell test -f $(G4LIB)/$(G4SYSTEM)/G4global.$(SHEXT) && echo yes)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifndef INCFLAGS
|
||||
ifeq ($(G4INCLUDE_EXEC),1)
|
||||
INCFLAGS := -I$(G4INCLUDE)
|
||||
else
|
||||
INCFLAGS := \
|
||||
-I$(G4BASE)/analysis/g4tools/include \
|
||||
-I$(G4BASE)/externals/g4tools/include \
|
||||
-I$(G4BASE)/analysis/management/include \
|
||||
-I$(G4BASE)/analysis/hntools/include \
|
||||
-I$(G4BASE)/analysis/csv/include \
|
||||
@@ -132,7 +132,6 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/processes/hadronic/models/inclxx/incl_physics/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/lend/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/lepto_nuclear/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/management/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/particle_hp/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/parton_string/diffraction/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/parton_string/hadronization/include \
|
||||
@@ -142,9 +141,7 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/processes/hadronic/models/qmd/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/quasi_elastic/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/radioactive_decay/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 \
|
||||
-I$(G4BASE)/processes/hadronic/stopping/include \
|
||||
-I$(G4BASE)/processes/hadronic/util/include \
|
||||
@@ -191,7 +188,7 @@ ifdef G4EXLIB
|
||||
LDFLAGS += -L$(G4TMPDIR)
|
||||
ifdef SHAREDLIBS
|
||||
ifdef G4RUNPATHOPTION
|
||||
# For the example dependent directory, keep the
|
||||
# For the example dependent directory, keep the
|
||||
# path to the shared lib in the executable.
|
||||
LDFLAGS += $(G4RUNPATHOPTION)$(G4TMPDIR)
|
||||
LDFLAGS += $(G4RUNPATHOPTION)$(G4LIB)/$(G4SYSTEM)
|
||||
@@ -219,7 +216,7 @@ ifdef G4EXLIB
|
||||
TARGETLIB := -l$(G4TARGET)
|
||||
else
|
||||
# Windows
|
||||
TARGETLIB := lib$(G4TARGET).a
|
||||
TARGETLIB := lib$(G4TARGET).a
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -267,6 +264,8 @@ ifdef GLOBALLIBS
|
||||
LDLIBS2 += -lG4expat
|
||||
endif
|
||||
|
||||
LDLIBS += -lG4tools
|
||||
|
||||
ifdef G4LIB_USE_ZLIB
|
||||
LDLIBS2 += -lG4zlib
|
||||
endif
|
||||
@@ -301,7 +300,7 @@ else
|
||||
# Warning: do not add to LDLIBS2 with += because this causes it to be
|
||||
# expanded too soon. Hence extra libraries must have a different name...
|
||||
# Extra libraries to resolve remaining circular dependencies...
|
||||
# LDLIBS2EXTRA =
|
||||
# LDLIBS2EXTRA =
|
||||
endif
|
||||
# Bring all symbols in for libraries which requires this (templated factories).
|
||||
#
|
||||
@@ -346,7 +345,7 @@ ifdef USER_DEFINED_LDLIBS
|
||||
else
|
||||
# Again, do not use := or +=. See note on LDLIBS2 above.
|
||||
LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
|
||||
# Version leaving out EXTRALIBS
|
||||
# Version leaving out EXTRALIBS
|
||||
LDLIBS_KERNEL = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
|
||||
endif
|
||||
LDLIBS_PREFINAL += $(LDLIBS4)
|
||||
@@ -373,12 +372,12 @@ ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
|
||||
else
|
||||
# Unix
|
||||
LDLIBS = $(TARGETLIB) $(LDLIBS_PREFINAL)
|
||||
OUT := -o
|
||||
OUT := -o
|
||||
TARGOBJEXT := o
|
||||
endif
|
||||
|
||||
ifdef transform-RPath
|
||||
# Invoke system specific transformation of
|
||||
# Invoke system specific transformation of
|
||||
include $(G4INSTALL)/config/sys/$(G4SYSTEM)-runpath.gmk
|
||||
endif
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# ------ MacOS-X ------
|
||||
# MacOS 10.8/9/10/11, clang-3.6 and higher
|
||||
# macOS 11, Apple clang-12 and higher
|
||||
#
|
||||
# Original author: Gabriele Cosmo - CERN
|
||||
#
|
||||
@@ -11,18 +11,9 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
CPPFLAGS += -DGL_SILENCE_DEPRECATION
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
G4USE_STD17 := 1
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec
|
||||
endif
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# ------ MacOS-X ------
|
||||
# MacOS 10.8/9/10/11, gcc-4.8 and higher
|
||||
# macOS 11, gcc-9.3 and higher
|
||||
#
|
||||
# Original author: Helmut Burkhardt - CERN
|
||||
# Revisions: Guy Barrand - LAL
|
||||
@@ -14,19 +14,10 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
CPPFLAGS += -DGL_SILENCE_DEPRECATION
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
# CXXFLAGS += -stdlib=libstdc++
|
||||
G4USE_STD17 := 1
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O3
|
||||
FCFLAGS := -O3
|
||||
|
||||
@@ -9,18 +9,9 @@ ifeq ($(G4SYSTEM),Linux-clang)
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe -pthread
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
G4USE_STD17 := 1
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec
|
||||
endif
|
||||
|
||||
@@ -7,18 +7,9 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe -pthread
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
G4USE_STD17 := 1
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec
|
||||
endif
|
||||
|
||||
@@ -4,18 +4,9 @@
|
||||
ifeq ($(G4SYSTEM),Linux-icc)
|
||||
CXX := icc
|
||||
CXXFLAGS := -ansi -fp-model precise -w1 -pthread
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
G4USE_STD17 := 1
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec
|
||||
endif
|
||||
|
||||
@@ -36,7 +36,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
OGLLIBS := opengl32.lib gdi32.lib user32.lib
|
||||
endif
|
||||
ifndef UI32LIBS
|
||||
UI32LIBS := gdi32.lib user32.lib
|
||||
UI32LIBS := gdi32.lib user32.lib comctl32.lib
|
||||
endif
|
||||
ifndef QTHOME
|
||||
QTHOME := /Qt
|
||||
|
||||
Reference in New Issue
Block a user