Import Geant4 10.4.2 source tree

config/History

@@ -1,4 +1,4 @@
-svn log $Id: History 108466 2018-02-15 13:48:04Z gcosmo $
+svn log $Id: History 110053 2018-05-15 08:55:49Z gcosmo $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,18 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+12th April 2018 Gabriele Cosmo  (config-V10-03-09)
+- WIN32-VC.gmk: updated obsolete configuration for Qt5.
+
+20th March 2018 Gabriele Cosmo
+- architecture.gmk: corrected default path for external expat and zlib.
+
+19th March 2018 Gabriele Cosmo
+- architecture.gmk: corrected settings for external expat and zlib.
+
+9th March 2018 Gabriele Cosmo
+- Darwing-clang.gmk: removed -pthread and -fPIC compilation options.
+
 14th February 2018 Gabriele Cosmo  (config-V10-03-08)
 - Disable "-Wl,-force_load" global linker flag for static libraries in macro
   Darwing-clang.gmk.

config/architecture.gmk

@@ -1,4 +1,4 @@
-# $Id: architecture.gmk 107491 2017-11-16 09:38:59Z gcosmo $
+# $Id: architecture.gmk 110053 2018-05-15 08:55:49Z gcosmo $
 # ------------------------------------------------------------------------
 #       GEANT 4 - Architecture configuration script for GNU Make
 #
@@ -288,13 +288,41 @@ endif
 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
   LDFLAGS  += -link $(LIB_PATH)$(G4INSTALL)/lib
 endif
-ifeq (,$(findstring WIN32-VC,$(G4SYSTEM)))
-  ifndef G4LIB_USE_EXPAT
-    LOADLIBS += -lexpat
+
+ifndef G4LIB_USE_EXPAT
+  ifndef EXPATROOT
+    EXPATROOT := /usr
   endif
-  ifndef G4LIB_USE_ZLIB
-    LOADLIBS += -lz
+  ifndef EXPATFLAGS
+    EXPATFLAGS := -I$(EXPATROOT)/include
   endif
+  ifndef EXPATLIBS
+    ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+      EXPATLIBS := $(LIB_PATH)$(EXPATROOT)/lib expat.lib
+    else
+      EXPATLIBS := -L$(EXPATROOT)/lib -lexpat
+    endif
+  endif
+  CPPFLAGS  += $(EXPATFLAGS)
+  LOADLIBS  += $(EXPATLIBS)
+endif
+
+ifndef G4LIB_USE_ZLIB
+  ifndef ZLIBROOT
+    ZLIBROOT := /usr
+  endif
+  ifndef ZLIBFLAGS
+    ZLIBFLAGS := -I$(ZLIBROOT)/include
+  endif
+  ifndef ZLIBLIBS
+    ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+      ZLIBLIBS := $(LIB_PATH)$(ZLIBROOT)/lib zlib.lib
+    else
+      ZLIBLIBS := -L$(ZLIBROOT)/lib -lz
+    endif
+  endif
+  CPPFLAGS  += $(ZLIBFLAGS)
+  LOADLIBS  += $(ZLIBLIBS)
 endif
 
 # Graphic variables...

config/sys/Darwin-clang.gmk

@@ -24,7 +24,7 @@ ifeq ($(G4SYSTEM),Darwin-clang)
     endif
   endif
   ifdef G4MULTITHREADED
-    CXXFLAGS += -ftls-model=initial-exec -pthread
+    CXXFLAGS += -ftls-model=initial-exec
   endif
   ifdef G4OPTIMISE
     CXXFLAGS  += -O3
@@ -47,11 +47,6 @@ ifeq ($(G4SYSTEM),Darwin-clang)
     FCFLAGS   += -O2 -g
     CCFLAGS   += -O2 -g
   endif
-  ifdef G4LIB_BUILD_SHARED
-    CXXFLAGS  += -fPIC
-    FCFLAGS   += -fPIC
-    CCFLAGS   += -fPIC
-  endif
   G4RUNPATHOPTION := -Wl,-rpath 
 #  G4STATIC_MODE += -Wl,-force_load
   FC := gfortran

config/sys/WIN32-VC.gmk

@@ -38,20 +38,24 @@ ifeq ($(G4SYSTEM),WIN32-VC)
     UI32LIBS  := gdi32.lib user32.lib
   endif
   ifndef QTHOME
-    QTHOME    := /usr
+    QTHOME   := /Qt
   endif
-  ifndef QTFLAGS
-    QTFLAGS   := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
+  ifndef QTFLAGS            # Qt5
+    QTFLAGS  := -I$(QTHOME)/include
+    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
   ifndef QTMOC
-    QTMOC     := $(QTHOME)/bin/moc
+    QTMOC    := $(QTHOME)/bin/moc
   endif
-
-  ifndef QTLIBS
-    QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib
+  ifndef QTLIBS              # Qt5
+    QTLIBS   := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib Qt5PrintSupport.lib
   endif
   ifndef GLQTLIBS
-    GLQTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib
+    GLQTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib Qt5OpenGL.lib Qt5PrintSupport.lib
   endif
 
 #
@@ -77,9 +81,6 @@ ifeq ($(G4SYSTEM),WIN32-VC)
 #  Note that a DLL must be fully linked. You should NOT have undefined 
 #  symbols as output of the link command.
 #
-  ifdef G4LIB_USE_USOLIDS
-    GLOBLIBS += libG4geomUSolids.lib
-  endif
   ifdef G4LIB_USE_CLHEP
     GLOBLIBS += libG4clhep.lib
   endif