Import Geant4 10.7.0 source tree
This commit is contained in:
Gabriele Cosmo
@@ -78,6 +78,11 @@ ifdef G4VIS_BUILD_OI_DRIVER
|
||||
INC_IV = 1
|
||||
CPPFLAGS += -DG4VIS_BUILD_OI_DRIVER
|
||||
endif
|
||||
ifdef G4VIS_BUILD_QT3D_DRIVER
|
||||
G4INTY_BUILD_QT = 1
|
||||
INC_QT = 1
|
||||
CPPFLAGS += -DG4VIS_BUILD_QT3D_DRIVER
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
CPPFLAGS += -DG4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
|
||||
@@ -118,6 +118,16 @@ ifdef G4VIS_USE_OI
|
||||
G4LIB_USE_GL2PS = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_USE_QT3D
|
||||
CPPFLAGS += -DG4VIS_USE_QT3D
|
||||
VISLIBS += -lG4visQt3D
|
||||
ifneq ($(G4INCLUDE_EXEC),1)
|
||||
CPPFLAGS += -I$(G4BASE)/visualization/Qt3D/include
|
||||
endif
|
||||
INC_QT = 1
|
||||
LOAD_3DQT = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_USE_RAYTRACERX
|
||||
CPPFLAGS += -DG4VIS_USE_RAYTRACERX
|
||||
# CPPFLAGS += -I... and VISLIBS += set above.
|
||||
|
||||
@@ -15,6 +15,9 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
22nd October 2020 Gabriele Cosmo (config-V10-06-07)
|
||||
- Added configuration for Qt3D visualization driver.
|
||||
|
||||
22nd June 2020 Gabriele Cosmo (config-V10-06-06)
|
||||
- Added -pthread to all builds in Linux targets.
|
||||
|
||||
|
||||
@@ -31,6 +31,9 @@ endif
|
||||
ifdef LOAD_QT
|
||||
INTYLIBS += $(QTLIBS)
|
||||
endif
|
||||
ifdef LOAD_3DQT
|
||||
INTYLIBS += $(QT3DLIBS)
|
||||
endif
|
||||
ifdef LOAD_GLQT
|
||||
INTYLIBS += $(GLQTLIBS)
|
||||
endif
|
||||
|
||||
@@ -105,9 +105,13 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
QTMOC := /usr/bin/moc
|
||||
endif
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTHOME)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtGui.framework/Headers
|
||||
QTFLAGS := -I $(QTHOME)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtWidgets.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtOpenGL.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DExtras.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DRender.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
@@ -122,12 +126,20 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
QTLIBS := -L$(QTLPATH) -lQtCore -lQtGui
|
||||
endif
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
QT3DLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
QT3DLIBS += -framework QtWidgets -framework Qt3DCore -framework Qt3DExtras -framework Qt3DRender
|
||||
else
|
||||
QT3DLIBS := -L$(QTLPATH) -lQtCore -lQtGui
|
||||
QT3DLIBS += -lQtWidgets -lQt3DCore -lQt3DExtras -lQt3DRender
|
||||
endif
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui -framework QtOpenGL
|
||||
else
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
endif
|
||||
endif
|
||||
else
|
||||
@@ -140,6 +152,9 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
QTFLAGS += -I $(QTLPATH)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtWidgets.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtOpenGL.framework/Headers
|
||||
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
|
||||
@@ -147,6 +162,12 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
QTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
QTLIBS += -framework QtWidgets -framework QtPrintSupport
|
||||
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
|
||||
|
||||
@@ -131,9 +131,13 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
QTMOC := /usr/bin/moc
|
||||
endif
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTHOME)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtGui.framework/Headers
|
||||
QTFLAGS := -I $(QTHOME)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtWidgets.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtOpenGL.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DExtras.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DRender.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
@@ -148,12 +152,20 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
QTLIBS := -L$(QTLPATH) -lQtCore -lQtGui
|
||||
endif
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
QT3DLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
QT3DLIBS += -framework QtWidgets -framework Qt3DCore -framework Qt3DExtras -framework Qt3DRender
|
||||
else
|
||||
QT3DLIBS := -L$(QTLPATH) -lQtCore -lQtGui
|
||||
QT3DLIBS += -lQtWidgets -lQt3DCore -lQt3DExtras -lQt3DRender
|
||||
endif
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui -framework QtOpenGL
|
||||
else
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
endif
|
||||
endif
|
||||
else
|
||||
@@ -166,6 +178,9 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
QTFLAGS += -I $(QTLPATH)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtWidgets.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtOpenGL.framework/Headers
|
||||
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
|
||||
@@ -173,6 +188,12 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
QTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
QTLIBS += -framework QtWidgets -framework QtPrintSupport
|
||||
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
|
||||
|
||||
@@ -110,6 +110,9 @@ ifeq ($(G4SYSTEM),Linux-clang)
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
|
||||
endif
|
||||
else # Qt4
|
||||
@@ -131,6 +134,9 @@ ifeq ($(G4SYSTEM),Linux-clang)
|
||||
ifndef QTLIBS # Qt5
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender -lQt5PrintSupport
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
|
||||
endif
|
||||
|
||||
@@ -108,6 +108,9 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
|
||||
endif
|
||||
else # Qt4
|
||||
@@ -129,6 +132,9 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
ifndef QTLIBS # Qt5
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender -lQt5PrintSupport
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user