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

Import Geant4 10.6.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2019-06-28 11:59:04 +02:00
parent 28a70706e0
commit d0f911957d
1056 changed files with 95168 additions and 78160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/sys/Linux-clang.gmk
+5 -3
View File
@@ -97,7 +97,9 @@ ifeq ($(G4SYSTEM),Linux-clang)
QTMOC := $(QTHOME)/bin/moc
endif
QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' )
ifndef QT_VERSION
QT_VERSION := 5
endif
ifeq ($(QT_VERSION),5)
ifndef QTFLAGS # Qt5
@@ -125,10 +127,10 @@ ifeq ($(G4SYSTEM),Linux-clang)
endif
ifeq ($(QT_VERSION),5)
ifndef QTLIBS # Qt5
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtWidgets -lQtPrintSupport
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
endif
ifndef GLQTLIBS
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtWidgets -lQtOpenGL -lQtPrintSupport
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
endif
else # Qt4
ifndef QTLIBS
config/sys/Linux-g++.gmk
+5 -3
View File
@@ -95,7 +95,9 @@ ifeq ($(G4SYSTEM),Linux-g++)
QTMOC := $(QTHOME)/bin/moc
endif
QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' )
ifndef QT_VERSION
QT_VERSION := 5
endif
ifeq ($(QT_VERSION),5)
ifndef QTFLAGS # Qt5
@@ -123,10 +125,10 @@ ifeq ($(G4SYSTEM),Linux-g++)
endif
ifeq ($(QT_VERSION),5)
ifndef QTLIBS # Qt5
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtWidgets -lQtPrintSupport
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
endif
ifndef GLQTLIBS
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtWidgets -lQtOpenGL -lQtPrintSupport
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
endif
else # Qt4
ifndef QTLIBS