Import Geant4 10.3.0 source tree
This commit is contained in:
Gabriele Cosmo
+20
-6
@@ -1,4 +1,4 @@
|
||||
svn log $Id: History 97771 2016-06-09 15:15:27Z gcosmo $
|
||||
svn log $Id: History 101512 2016-11-18 15:28:47Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -16,12 +16,26 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
8th June 2016 Gunter Folger (config-V10-02-04)
|
||||
- revert previous change for G4{,NO}STATIC_MODE
|
||||
18th November 2016 Gunter Folger (config-V10-02-07)
|
||||
- add include for analysis/accumulables
|
||||
- revert change forcing load of libraries
|
||||
|
||||
8th June 2016 Gunter Folger (config-V10-02-03)
|
||||
- delete G4STATIC_MODE and G4NOSTATIC_MODE options in sys/Darwin* and sys/linux*
|
||||
This is not a complete removal of the option yet...
|
||||
9th November 2016 Gunter Folger (config-V10-02-06) *tag REJECTED*
|
||||
- Force loading of symbols for physics_lists/constructor and builders
|
||||
libraries in granular mode for static libs
|
||||
|
||||
17th October 2016 Gabriele Cosmo (config-V10-02-05)
|
||||
- Changed default optimisation settings to -O3 for g++, clang and icc.
|
||||
- Added -fno-trapping-math -ftree-vectorize -fno-math-errno to g++ and
|
||||
clang settings.
|
||||
- Better factorise -std options in scripts.
|
||||
|
||||
8th June 2016 Gunter Folger (config-V10-02-04)
|
||||
- Reverted previous change for G4{,NO}STATIC_MODE
|
||||
|
||||
8th June 2016 Gunter Folger (config-V10-02-03)
|
||||
- Deleted G4STATIC_MODE and G4NOSTATIC_MODE options in sys/Darwin*
|
||||
and sys/linux*. This is not a complete removal of the option yet...
|
||||
|
||||
25th April 2016 Gabriele Cosmo (config-V10-02-02)
|
||||
- Added Linux-clang.gmk script for use of clang compiler on Linux system.
|
||||
|
||||
+2
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: binmake.gmk 94578 2015-11-25 08:11:03Z gcosmo $
|
||||
# $Id: binmake.gmk 101512 2016-11-18 15:28:47Z gcosmo $
|
||||
# ----------------------------------------------------------
|
||||
# Script defining rules and paths for making binaries.
|
||||
# First implementation: Gabriele Cosmo, 25/06/1998.
|
||||
@@ -52,6 +52,7 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/analysis/root/include \
|
||||
-I$(G4BASE)/analysis/xml/include \
|
||||
-I$(G4BASE)/analysis/parameters/include \
|
||||
-I$(G4BASE)/analysis/accumulables/include \
|
||||
-I$(G4BASE)/global/management/include \
|
||||
-I$(G4BASE)/global/HEPRandom/include \
|
||||
-I$(G4BASE)/global/HEPGeometry/include \
|
||||
|
||||
+13
-12
@@ -9,26 +9,27 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
CXXFLAGS := -Wall -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
|
||||
ifdef G4USE_STD11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
G4USE_STD11 := 1
|
||||
ifdef G4USE_STD14
|
||||
G4USE_STD11 := 1
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
endif
|
||||
ifdef G4USE_STD17
|
||||
G4USE_STD11 := 1
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
CCFLAGS := -O2
|
||||
CXXFLAGS += -O3
|
||||
FCFLAGS := -O3
|
||||
CCFLAGS := -O3
|
||||
else
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -g
|
||||
|
||||
+13
-13
@@ -10,27 +10,27 @@
|
||||
ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
CXX := g++
|
||||
CXXFLAGS := -Wall -Wno-non-virtual-dtor -Wno-long-long
|
||||
# CXXFLAGS += -Wunused-parameter -Winline -Wunreachable-code
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
|
||||
ifdef G4USE_STD11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
G4USE_STD11 := 1
|
||||
ifdef G4USE_STD14
|
||||
G4USE_STD11 := 1
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
endif
|
||||
ifdef G4USE_STD17
|
||||
G4USE_STD11 := 1
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
# CXXFLAGS += -stdlib=libstdc++
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
CCFLAGS := -O2
|
||||
CXXFLAGS += -O3
|
||||
FCFLAGS := -O3
|
||||
CCFLAGS := -O3
|
||||
else
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -g
|
||||
|
||||
+13
-13
@@ -8,27 +8,27 @@ ifeq ($(G4SYSTEM),Linux-clang)
|
||||
CXXFLAGS := -Wall -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
|
||||
ifdef G4USE_STD11
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
G4USE_STD11 := 1
|
||||
ifdef G4USE_STD14
|
||||
G4USE_STD11 := 1
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
endif
|
||||
ifdef G4USE_STD17
|
||||
G4USE_STD11 := 1
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
CCFLAGS := -O2
|
||||
CXXFLAGS += -O3
|
||||
FCFLAGS := -O3
|
||||
CCFLAGS := -O3
|
||||
else
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -g
|
||||
|
||||
+15
-24
@@ -4,38 +4,29 @@
|
||||
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 -pipe
|
||||
CXXFLAGS += -Wshadow
|
||||
ifdef G4USE_STD11
|
||||
CPPFLAGS += -std=c++11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
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
|
||||
ifdef G4USE_STD14
|
||||
G4USE_STD11 := 1
|
||||
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
|
||||
ifdef G4USE_STD17
|
||||
G4USE_STD11 := 1
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
endif
|
||||
#
|
||||
# Uncomment the following options to activate Pentium4 chip specific
|
||||
# floating-point operations on the SSE unit. It will allow for more stable
|
||||
# results (no output differences between debug/optimised runs) and little
|
||||
# performance improvement (in the order of 2%).
|
||||
# NOTE: binaries built using these options will NOT be portable cross
|
||||
# platforms. Will only run on Pentium4-based architectures !
|
||||
#
|
||||
# CXXFLAGS += -march=pentium4 -mfpmath=sse
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
CCFLAGS := -O2
|
||||
CXXFLAGS += -O3
|
||||
FCFLAGS := -O3
|
||||
CCFLAGS := -O3
|
||||
else
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -g
|
||||
|
||||
+12
-13
@@ -4,27 +4,26 @@
|
||||
ifeq ($(G4SYSTEM),Linux-icc)
|
||||
CXX := icc
|
||||
CXXFLAGS := -ansi -fp-model precise -w1
|
||||
ifdef G4USE_STD11
|
||||
CPPFLAGS += -std=c++11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
G4USE_STD11 := 1
|
||||
ifdef G4USE_STD14
|
||||
G4USE_STD11 := 1
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
endif
|
||||
ifdef G4USE_STD17
|
||||
G4USE_STD11 := 1
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
CCFLAGS := -O2
|
||||
CXXFLAGS += -O3
|
||||
FCFLAGS := -O3
|
||||
CCFLAGS := -O3
|
||||
else
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -g
|
||||
|
||||
+16
-15
@@ -7,26 +7,27 @@
|
||||
#
|
||||
ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
CXX := g++
|
||||
CXXFLAGS := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
|
||||
ifdef G4USE_STD11
|
||||
CPPFLAGS += -std=c++11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
CXXFLAGS := -Wall -Wno-non-virtual-dtor -Wno-long-long
|
||||
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
|
||||
ifdef G4USE_STD14
|
||||
G4USE_STD11 := 1
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
endif
|
||||
ifdef G4USE_STD17
|
||||
G4USE_STD11 := 1
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
FCFLAGS := -O
|
||||
CCFLAGS := -O
|
||||
CXXFLAGS += -O3
|
||||
FCFLAGS := -O3
|
||||
CCFLAGS := -O3
|
||||
else
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -g
|
||||
|
||||
Reference in New Issue
Block a user