Import Geant4 10.6.0.beta source tree

config/History

@@ -15,6 +15,15 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+16th May 2019 Gabriele Cosmo (config-V10-05-01)
+- Hard-code Qt version through QT_VERSION flag.
+  Corrected Qt5 setup for Linux-g++ and Linux-clang.
+
+26th April 2019 Ben Morgan (config-V10-05-00)
+- Add -DG4GMAKE to CPPFLAGS to indicate use, or not, of Geant4Make.
+  This is to protect use or not of the new G4GlobalConfig header
+  introduced in cmake-V10-05-02.
+
 28th September 2018 Gabriele Cosmo  (config-V10-04-09)
 - Added -DGL_SILENCE_DEPRECATION to CPPFLAGS to Darwin setups to silence
   deprecation compilation warnings on MacOS 10.14 Mojave.

config/architecture.gmk

@@ -12,16 +12,21 @@
 # List of the supported architectures/compilers and related flavors for
 # the environment variable G4SYSTEM:
 #
-#          Linux-g++   Linux (Red Hat Enterprise/SCL5), gcc-4.1.2 (default)
+#          Linux-g++    Linux (CentOS7), gcc-4.8.4 (default)
 #
-#          Darwin-g++  MacOSX 10.7, gcc-4.2.1
+#          Darwin-clang MacOSX 10.14, clang-7
 #
-#          WIN32-VC    Windows 7 and Microsoft Visual C++ 10.0
+#          WIN32-VC     Windows 10 and Microsoft Visual C++ 14.11
 # 
 # -------------------------------------------------------------------------
 
 MAKEFLAGS= --no-print-directory
 
+# Define that we are building Geant4 with Geant4Make
+#
+CPPFLAGS += -DG4GMAKE
+G4GMAKE := 1
+
 # If not specified, the default path for G4 installation G4INSTALL is
 # set to $HOME/geant4 ...
 #

config/sys/Linux-clang.gmk

@@ -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

@@ -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