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

Import Geant4 11.2.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2023-06-30 09:09:57 +02:00
parent aef78ca386
commit dd1f179cda
3780 changed files with 212808 additions and 142780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/G4UI_USE.gmk
+4 -4
View File
@@ -24,11 +24,11 @@ endif
# there is no need to use it.
ifneq ($(G4INCLUDE_EXEC),1)
CPPFLAGS += -I$(G4BASE)/interfaces/basic/include
CPPFLAGS += -I$(G4BASE)/interfaces/common/include
CPPFLAGS += -I$(G4BASE)/interfaces/core/include
CPPFLAGS += -I$(G4BASE)/interfaces/implementation/include
endif
UILIBS += -lG4UIbasic
UILIBS += -lG4UIcommon
UILIBS += -lG4UIcore
UILIBS += -lG4UIimplementation
ifdef G4UI_USE_TERMINAL
G4UI_USE = 1
config/History
+9
View File
@@ -6,6 +6,15 @@ It must **not** be used as a substitute for writing good git commit messages!
--------------------------------------------------------------------------------
## 2023-05-10 Ben Morgan (config-V11-01-02)
- Update config scripts for split of G4persistency library
## 2023-04-02 Ben Morgan (config-V11-01-01)
- No longer link to QtPrintSupport, which is not used in the toolkit.
## 2023-02-01 Ben Morgan (config-V11-01-00)
- Update UI/interfaces include paths to reflect new organization
## 2022-11-02 Gabriele Cosmo (config-V11-00-12)
- Silence ld warnings in Darwin setups.
config/binmake.gmk
+5 -1
View File
@@ -226,7 +226,11 @@ LDLIBS1 := $(EXTRALIBS)
# VISLIBS (and UILIBS?) is handled by the granular library script...
#
ifdef GLOBALLIBS
LDLIBS2 := $(VISLIBS) -lG4interfaces -lG4persistency
LDLIBS2 := $(VISLIBS) -lG4interfaces -lG4mctruth -lG4geomtext
ifdef G4LIB_USE_GDML
LDLIBS2 += -lG4gdml
endif
ifdef G4LIB_USE_G3TOG4
LDLIBS2 += -lG3toG4
config/sys/Darwin-clang.gmk
+2 -4
View File
@@ -146,23 +146,21 @@ ifeq ($(G4SYSTEM),Darwin-clang)
QTFLAGS += -I $(QTLPATH)/Qt3DCore.framework/Headers
QTFLAGS += -I $(QTLPATH)/Qt3DExtras.framework/Headers
QTFLAGS += -I $(QTLPATH)/Qt3DRender.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
QTLIBS += -framework QtWidgets
endif
ifndef QT3DLIBS
QT3DLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
QT3DLIBS += -framework QtWidgets
QT3DLIBS += -framework Qt3DCore -framework Qt3DExtras -framework Qt3DRender
QT3DLIBS += -framework QtPrintSupport
endif
ifndef GLQTLIBS
GLQTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
GLQTLIBS += -framework QtWidgets
GLQTLIBS += -framework QtOpenGL -framework QtPrintSupport
GLQTLIBS += -framework QtOpenGL
endif
endif
config/sys/Darwin-g++.gmk
+2 -4
View File
@@ -175,23 +175,21 @@ ifeq ($(G4SYSTEM),Darwin-g++)
QTFLAGS += -I $(QTLPATH)/Qt3DCore.framework/Headers
QTFLAGS += -I $(QTLPATH)/Qt3DExtras.framework/Headers
QTFLAGS += -I $(QTLPATH)/Qt3DRender.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
QTLIBS += -framework QtWidgets
endif
ifndef QT3DLIBS
QT3DLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
QT3DLIBS += -framework QtWidgets
QT3DLIBS += -framework Qt3DCore -framework Qt3DExtras -framework Qt3DRender
QT3DLIBS += -framework QtPrintSupport
endif
ifndef GLQTLIBS
GLQTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
GLQTLIBS += -framework QtWidgets
GLQTLIBS += -framework QtOpenGL -framework QtPrintSupport
GLQTLIBS += -framework QtOpenGL
endif
endif
config/sys/Linux-clang.gmk
+3 -4
View File
@@ -106,7 +106,6 @@ ifeq ($(G4SYSTEM),Linux-clang)
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
endif
else # Qt4
ifndef QTFLAGS
@@ -125,13 +124,13 @@ ifeq ($(G4SYSTEM),Linux-clang)
endif
ifeq ($(QT_VERSION),5)
ifndef QTLIBS # Qt5
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
endif
ifndef QT3DLIBS
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender -lQt5PrintSupport
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
endif
ifndef GLQTLIBS
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
endif
else # Qt4
ifndef QTLIBS
config/sys/Linux-g++.gmk
+3 -4
View File
@@ -103,7 +103,6 @@ ifeq ($(G4SYSTEM),Linux-g++)
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
endif
else # Qt4
ifndef QTFLAGS
@@ -122,13 +121,13 @@ ifeq ($(G4SYSTEM),Linux-g++)
endif
ifeq ($(QT_VERSION),5)
ifndef QTLIBS # Qt5
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
endif
ifndef QT3DLIBS
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender -lQt5PrintSupport
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
endif
ifndef GLQTLIBS
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
endif
else # Qt4
ifndef QTLIBS
config/sys/Linux-icc.gmk
+3 -4
View File
@@ -97,7 +97,6 @@ ifeq ($(G4SYSTEM),Linux-icc)
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
endif
else # Qt4
ifndef QTFLAGS
@@ -116,13 +115,13 @@ ifeq ($(G4SYSTEM),Linux-icc)
endif
ifeq ($(QT_VERSION),5)
ifndef QTLIBS # Qt5
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
endif
ifndef QT3DLIBS
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender -lQt5PrintSupport
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
endif
ifndef GLQTLIBS
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
endif
else # Qt4
ifndef QTLIBS
config/sys/Linux-icx.gmk
+3 -4
View File
@@ -98,7 +98,6 @@ ifeq ($(G4SYSTEM),Linux-icx)
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
endif
else # Qt4
ifndef QTFLAGS
@@ -117,13 +116,13 @@ ifeq ($(G4SYSTEM),Linux-icx)
endif
ifeq ($(QT_VERSION),5)
ifndef QTLIBS # Qt5
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
endif
ifndef QT3DLIBS
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender -lQt5PrintSupport
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
endif
ifndef GLQTLIBS
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
endif
else # Qt4
ifndef QTLIBS
config/sys/WIN32-VC.gmk
+2 -4
View File
@@ -47,16 +47,14 @@ ifeq ($(G4SYSTEM),WIN32-VC)
QTFLAGS += -I$(QTHOME)/include/QtGui
QTFLAGS += -I$(QTHOME)/include/QtWidgets
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
QTFLAGS += -I$(QTHOME)/include/QtPrintSupport
endif
ifndef QTMOC
QTMOC := $(QTHOME)/bin/moc
endif
ifndef QTLIBS # Qt5
QTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib Qt5PrintSupport.lib
endif
QTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib
ifndef GLQTLIBS
GLQTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib Qt5OpenGL.lib Qt5PrintSupport.lib
GLQTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib Qt5OpenGL.lib
endif
#