Import Geant4 10.3.0.beta source tree
This commit is contained in:
Gabriele Cosmo
+17
-1
@@ -1,4 +1,4 @@
|
||||
svn log $Id: History 94578 2015-11-25 08:11:03Z gcosmo $
|
||||
svn log $Id: History 97771 2016-06-09 15:15:27Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -16,6 +16,22 @@ 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
|
||||
|
||||
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...
|
||||
|
||||
25th April 2016 Gabriele Cosmo (config-V10-02-02)
|
||||
- Added Linux-clang.gmk script for use of clang compiler on Linux system.
|
||||
|
||||
14th April 2016 Gabriele Cosmo (config-V10-02-01)
|
||||
- Added flags for partial use of USolids/VecGeom types.
|
||||
|
||||
5th February 2016 Gabriele Cosmo (config-V10-02-00)
|
||||
- Added settings for 14 and 17 C++ standards in platform specific scripts.
|
||||
|
||||
24th November 2015 Gabriele Cosmo (config-V10-01-08)
|
||||
- binmake.gmk: added "analysis/parameters/include" to INCFLAGS.
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: architecture.gmk 93150 2015-10-08 11:52:29Z gcosmo $
|
||||
# $Id: architecture.gmk 96443 2016-04-14 14:19:28Z gcosmo $
|
||||
# ------------------------------------------------------------------------
|
||||
# GEANT 4 - Architecture configuration script for GNU Make
|
||||
#
|
||||
@@ -180,6 +180,12 @@ endif
|
||||
# USolids path, etc.
|
||||
#
|
||||
ifdef G4GEOM_USE_USOLIDS
|
||||
G4USOLIDS :=1
|
||||
endif
|
||||
ifdef G4GEOM_USE_PARTIAL_USOLIDS
|
||||
G4USOLIDS :=1
|
||||
endif
|
||||
ifdef G4USOLIDS
|
||||
G4LIB_USE_USOLIDS := 1
|
||||
ifndef USOLIDS_BASE_DIR
|
||||
$(error ERROR - Define path USOLIDS_BASE_DIR to USolids/VecGeom installation!)
|
||||
@@ -275,10 +281,10 @@ endif
|
||||
ifdef G4LIB_USE_USOLIDS
|
||||
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
|
||||
LDFLAGS += -link $(LIB_PATH)$(USOLIDS_LIB_DIR)
|
||||
LOADLIBS += $(USOLIDS_LIB) # $(VECGEOM_LIB)
|
||||
LOADLIBS += $(USOLIDS_LIB) $(VECGEOM_LIB)
|
||||
else
|
||||
LDFLAGS += -L$(USOLIDS_LIB_DIR)
|
||||
LOADLIBS += -l$(USOLIDS_LIB) # -l$(VECGEOM_LIB)
|
||||
LOADLIBS += -l$(USOLIDS_LIB) -l$(VECGEOM_LIB)
|
||||
endif
|
||||
endif
|
||||
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
|
||||
|
||||
+10
-1
@@ -7,7 +7,12 @@
|
||||
|
||||
ifdef G4GEOM_USE_USOLIDS
|
||||
CPPFLAGS += -DG4GEOM_USE_USOLIDS
|
||||
CPPFLAGS += -DVECGEOM_SCALAR -DVECGEOM_REPLACE_USOLIDS -DVECGEOM_NO_SPECIALIZATION -DVECGEOM_USOLIDS
|
||||
UEXTRAFLAGS := 1
|
||||
endif
|
||||
|
||||
ifdef G4GEOM_USE_PARTIAL_USOLIDS
|
||||
CPPFLAGS += -DG4GEOM_USE_PARTIAL_USOLIDS
|
||||
UEXTRAFLAGS := 1
|
||||
endif
|
||||
|
||||
ifdef G4GEOM_USE_UBOX
|
||||
@@ -55,3 +60,7 @@ endif
|
||||
ifdef G4GEOM_USE_UTUBS
|
||||
CPPFLAGS += -DG4GEOM_USE_UTUBS
|
||||
endif
|
||||
|
||||
ifdef UEXTRAFLAGS
|
||||
CPPFLAGS += -DVECGEOM_SCALAR -DVECGEOM_REPLACE_USOLIDS -DVECGEOM_NO_SPECIALIZATION -DVECGEOM_USOLIDS
|
||||
endif
|
||||
|
||||
@@ -12,6 +12,16 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
ifdef G4USE_STD11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
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
|
||||
endif
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
|
||||
@@ -16,6 +16,16 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
ifdef G4USE_STD11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
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
|
||||
endif
|
||||
# CXXFLAGS += -stdlib=libstdc++
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
#
|
||||
# ------ GNU/LINUX ------ clang 3.6 and higher
|
||||
#
|
||||
# Original author: Gabriele Cosmo - CERN
|
||||
#
|
||||
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
|
||||
ifdef G4USE_STD11
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
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
|
||||
endif
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
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
|
||||
ifdef G4LIB_BUILD_SHARED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath
|
||||
G4STATIC_MODE += -Wl,--whole-archive
|
||||
G4NOSTATIC_MODE += -Wl,--no-whole-archive
|
||||
CC := clang
|
||||
FC := gfortran
|
||||
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
|
||||
FCLIBS := -lg2c -lnsl
|
||||
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
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib$(ARCH) -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
endif
|
||||
ifndef XMFLAGS
|
||||
XMFLAGS := -I/usr/X11R6/include
|
||||
endif
|
||||
ifndef XMLIBS
|
||||
XMLIBS := -lXm -lXpm
|
||||
endif
|
||||
ifndef XAWFLAGS
|
||||
XAWFLAGS := -I/usr/X11R6/include
|
||||
endif
|
||||
ifndef XAWLIBS
|
||||
XAWLIBS := -lXaw
|
||||
endif
|
||||
DLDLIBS := -ldl
|
||||
ifndef OGLFLAGS
|
||||
OGLFLAGS := -I$(OGLHOME)/include
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
OGLLIBS := -L$(OGLHOME)/lib$(ARCH) -lGLU -lGL
|
||||
endif
|
||||
|
||||
# ---- QT Setup block -------------------------------------------------------
|
||||
|
||||
ifndef QTHOME
|
||||
QTHOME := /usr
|
||||
endif
|
||||
ifndef QTMOC
|
||||
QTMOC := $(QTHOME)/bin/moc
|
||||
endif
|
||||
|
||||
QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' )
|
||||
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTFLAGS # Qt5
|
||||
QTFLAGS := -I $(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I $(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I$(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I$(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I$(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
|
||||
endif
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
QTLIBPATH := $(QTHOME)/lib
|
||||
QT_SEARCH_LIB := $(shell ls $(QTLIBPATH)/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
|
||||
ifneq ($(QT_SEARCH_LIB),0)
|
||||
QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTLIBS # Qt5
|
||||
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtWidgets -lQtPrintSupport
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtWidgets -lQtOpenGL -lQtPrintSupport
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
endif
|
||||
endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
define build-granular-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMPDIR); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
|
||||
endef
|
||||
define build-global-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMP)/$(G4SYSTEM); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
|
||||
$(foreach dir,$(SUBLIBS),$(dir)/*.o);
|
||||
endef
|
||||
|
||||
endif
|
||||
@@ -10,6 +10,16 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
CPPFLAGS += -std=c++11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
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
|
||||
endif
|
||||
#
|
||||
# Uncomment the following options to activate Pentium4 chip specific
|
||||
# floating-point operations on the SSE unit. It will allow for more stable
|
||||
|
||||
@@ -8,6 +8,16 @@ ifeq ($(G4SYSTEM),Linux-icc)
|
||||
CPPFLAGS += -std=c++11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
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
|
||||
endif
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
|
||||
@@ -13,6 +13,16 @@ ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
CPPFLAGS += -std=c++11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
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
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
FCFLAGS := -O
|
||||
|
||||
Reference in New Issue
Block a user