Import Geant4 10.0.0 source tree
This commit is contained in:
Gabriele Cosmo
+53
-35
@@ -1,13 +1,17 @@
|
||||
#
|
||||
# ------ MacOS-X ------
|
||||
# MacOS 10.7 clang-3.0
|
||||
# MacOS 10.8, 10.9 clang-3.X
|
||||
#
|
||||
# Original author: Gabriele Cosmo - CERN
|
||||
#
|
||||
ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
CXX := clang
|
||||
CXXFLAGS := -Wall -pedantic -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS := -Wall -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
@@ -34,9 +38,9 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
LDFLAGS += -bind_at_load
|
||||
FCLIBS := -lg2c -lnsl
|
||||
SHEXT := dylib
|
||||
LOADLIBS += -lm -lstdc++
|
||||
LOADLIBS += -lm
|
||||
ifndef X11FLAGS
|
||||
X11FLAGS := -I/usr/X11R6/include/X11/extensions -I/usr/X11R6/include/X11
|
||||
X11FLAGS := -I/usr/X11R6/include
|
||||
endif
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
@@ -80,43 +84,57 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
ifndef QTHOME
|
||||
QTHOME := /Library/Frameworks
|
||||
endif
|
||||
ifndef QTMOC
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifndef QTMOC
|
||||
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)
|
||||
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
|
||||
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
|
||||
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
|
||||
else
|
||||
ifndef QTMOC
|
||||
QTMOC := $(QTHOME)/bin/moc
|
||||
endif
|
||||
QTLPATH := $(QTHOME)/lib
|
||||
ifndef QTFLAGS # Qt5
|
||||
QTFLAGS := -I $(QTLPATH)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtWidgets.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtOpenGL.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtPrintSupport.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
QTLIBS += -framework QtWidgets -framework QtPrintSupport
|
||||
endif
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
else
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtWidgets
|
||||
GLQTLIBS += -framework QtOpenGL -framework QtPrintSupport
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
+52
-36
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# ------ MacOS-X ------
|
||||
# MacOS 10.7 gcc-4.2
|
||||
# MacOS 10.8, 10.9 gcc-4.2
|
||||
#
|
||||
# Original author: Helmut Burkhardt - CERN
|
||||
# Revisions: Guy Barrand - LAL
|
||||
@@ -9,9 +9,11 @@
|
||||
#
|
||||
ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
CXX := g++
|
||||
CXXFLAGS := -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS := -Wall -Wno-non-virtual-dtor -Wno-long-long
|
||||
# CXXFLAGS += -Wunused-parameter -Winline -Wunreachable-code
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow
|
||||
# CXXFLAGS += -stdlib=libstdc++
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
@@ -35,12 +37,12 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
endif
|
||||
FC := gfortran
|
||||
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
|
||||
LDFLAGS += -bind_at_load -arch_multiple
|
||||
LDFLAGS += -bind_at_load
|
||||
FCLIBS := -lg2c -lnsl
|
||||
SHEXT := dylib
|
||||
LOADLIBS += -lm -lstdc++
|
||||
LOADLIBS += -lm
|
||||
ifndef X11FLAGS
|
||||
X11FLAGS := -I/usr/X11R6/include/X11/extensions -I/usr/X11R6/include/X11
|
||||
X11FLAGS := -I/usr/X11R6/include
|
||||
endif
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
@@ -93,43 +95,57 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
ifndef QTHOME
|
||||
QTHOME := /Library/Frameworks
|
||||
endif
|
||||
ifndef QTMOC
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifndef QTMOC
|
||||
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)
|
||||
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
|
||||
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
|
||||
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
|
||||
else
|
||||
ifndef QTMOC
|
||||
QTMOC := $(QTHOME)/bin/moc
|
||||
endif
|
||||
QTLPATH := $(QTHOME)/lib
|
||||
ifndef QTFLAGS # Qt5
|
||||
QTFLAGS := -I $(QTLPATH)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtWidgets.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtOpenGL.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtPrintSupport.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
QTLIBS += -framework QtWidgets -framework QtPrintSupport
|
||||
endif
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
else
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtWidgets
|
||||
GLQTLIBS += -framework QtOpenGL -framework QtPrintSupport
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
#
|
||||
# ------ GNU/LINUX ------ !!! not supported !!!
|
||||
# Red-Hat 6.1, egcs-1.1.2 (gcc-2.91.66)
|
||||
ifeq ($(G4SYSTEM),Linux-egcs)
|
||||
CXX := g++
|
||||
CXXFLAGS := -pipe
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
FCFLAGS := -O
|
||||
CCFLAGS := -O
|
||||
else
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
ifdef G4PROFILE
|
||||
CXXFLAGS += -pg
|
||||
FCFLAGS += -pg
|
||||
CCFLAGS += -pg
|
||||
endif
|
||||
ifdef G4LIB_BUILD_SHARED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath
|
||||
FC := g77
|
||||
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
|
||||
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
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -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 -lGLU -lGL
|
||||
endif
|
||||
define build-granular-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMPDIR); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o
|
||||
endef
|
||||
define build-global-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMP)/$(G4SYSTEM); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \
|
||||
$(foreach dir,$(SUBLIBS),$(dir)/*.o);
|
||||
endef
|
||||
|
||||
endif
|
||||
+39
-13
@@ -5,6 +5,7 @@ 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
|
||||
#
|
||||
# Uncomment the following options to activate Pentium4 chip specific
|
||||
# floating-point operations on the SSE unit. It will allow for more stable
|
||||
@@ -14,6 +15,9 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
# 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
|
||||
@@ -36,9 +40,11 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
CCFLAGS += -O2 -g
|
||||
endif
|
||||
ifdef G4LIB_BUILD_SHARED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
ifndef G4MULTITHREADED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
endif
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath
|
||||
CC := gcc
|
||||
@@ -86,11 +92,22 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
|
||||
QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' )
|
||||
|
||||
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
|
||||
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
|
||||
@@ -99,11 +116,20 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
|
||||
endif
|
||||
endif
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
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
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
ifeq ($(G4SYSTEM),Linux-icc)
|
||||
CXX := icc
|
||||
CXXFLAGS := -ansi -fp-model precise -no-gcc -w1
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
@@ -21,9 +24,11 @@ ifeq ($(G4SYSTEM),Linux-icc)
|
||||
CCFLAGS += -pg
|
||||
endif
|
||||
ifdef G4LIB_BUILD_SHARED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
ifndef G4MULTITHREADED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
endif
|
||||
LDFLAGS += -i-dynamic
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath -Wl,
|
||||
|
||||
Reference in New Issue
Block a user