Import Geant4 10.7.1 source tree

cmake/History

@@ -30,6 +30,25 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
 
      ----------------------------------------------------------
 
+30th January 2021 - Gunter Folger (cmake-V10-06-51)
+- Update to patched dataset G4PARTICLEXS 3.1.1 as provided by Vladimir I. 
+
+22nd January 2021 - Ben Morgan (cmake-V10-06-50)
+- Update for GitHub PR #17: Provide same fix for MacPorts
+- Address Bugzilla #2303: Fail configuration if Qt is enabled with CMake < 3.9
+
+15th January 2021 - Ben Morgan (cmake-V10-06-49)
+- Apply GitHub PR #17 from Florian Uhlig: Fix installation
+  error with Homebrew X11/GL. 
+
+11th January 2021 - Ben Morgan (cmake-V10-06-48)
+- Apply GitHub PR #16 from andriish: Fix configure/build with
+  system PTL 1.0.0.
+
+14th December 2020 - Ben Morgan (cmake-V10-06-47)
+- Install/Use builtin PTL CMake scripts from PTL subdirectory
+  alongside Geant4Config.cmake
+
 20th November 2020 - Ben Morgan (cmake-V10-06-46)
 - Make GEANT4_USE_SYSTEM_PTL option advanced
 

cmake/Modules/FindXQuartzGL.cmake

@@ -2,8 +2,8 @@
 FindXQuartzGL
 -------------
 
-FindModule for XQuartz implementation of OpenGL/GLU. Specific to Geant4
-to allow use of XQuartz only.
+FindModule for XQuartz/Homebrew/MacPorts implementation of OpenGL/GLU. Specific
+to Geant4 to allow use of XQuartz/Homebrew/MacPorts only.
 
 Use of the module on non-macOS systems will result in a fatal error
 
@@ -49,17 +49,17 @@ set(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK})
 set(CMAKE_FIND_FRAMEWORK NEVER)
 
 find_path(XQuartzGL_INCLUDE_DIR GL/gl.h
-  PATHS /usr/X11R6/include /opt/X11/include
+  PATHS /usr/X11R6/include /opt/X11/include /usr/local/include /opt/local/include
   NO_DEFAULT_PATH
   )
 
 find_library(XQuartzGL_gl_LIBRARY GL
-  PATHS /usr/X11R6/lib /opt/X11/lib
+  PATHS /usr/X11R6/lib /opt/X11/lib /usr/local/lib /opt/local/lib
   NO_DEFAULT_PATH
   )
 
 find_library(XQuartzGL_glu_LIBRARY GLU
-  PATHS /usr/X11R6/lib /opt/X11/lib
+  PATHS /usr/X11R6/lib /opt/X11/lib /usr/local/lib /opt/local/lib
   NO_DEFAULT_PATH
   )
 

cmake/Modules/G4ConfigureCMakeHelpers.cmake

@@ -87,7 +87,7 @@ endif()
 if(NOT GEANT4_USE_SYSTEM_PTL)
   list(APPEND GEANT4_EXTERNALS_TARGETS G4ptl)
   set(PTL_BUILDTREE_PREFIX "${PROJECT_BINARY_DIR}/source/externals/ptl")
-  set(PTL_INSTALLTREE_PREFIX "\${_geant4_thisdir}/../PTL")
+  set(PTL_INSTALLTREE_PREFIX "\${_geant4_thisdir}/PTL")
 endif()
 
 # - USolids

cmake/Modules/G4DatasetDefinitions.cmake

@@ -48,11 +48,11 @@ geant4_add_dataset(
 # - Particle XS - replaces Neutron XS
 geant4_add_dataset(
   NAME      G4PARTICLEXS
-  VERSION   3.1
+  VERSION   3.1.1
   FILENAME  G4PARTICLEXS
   EXTENSION tar.gz
   ENVVAR    G4PARTICLEXSDATA
-  MD5SUM    35a3fe5cf0a29d453e6805e2cfacacee
+  MD5SUM    98b766fa2c447b541834cc9bf5206c05
   )
 
 # - PII

cmake/Modules/G4InterfaceOptions.cmake

@@ -132,6 +132,11 @@ endif()
 
 # - Qt5
 if(GEANT4_USE_QT)
+  # Must have CMake > 3.8 to support automoc (Bugzilla 2303)
+  if(CMAKE_VERSION VERSION_LESS 3.9)
+    message(FATAL_ERROR "GEANT4_USE_QT requires CMake 3.9 or newer to support automatic MOC for UI/Vis libraries")
+  endif()
+
   find_package(Qt5Core REQUIRED)
   find_package(Qt5Gui REQUIRED)
   find_package(Qt5Widgets REQUIRED)

cmake/Modules/G4OptionalComponents.cmake

@@ -177,7 +177,7 @@ option(GEANT4_USE_SYSTEM_PTL "Use system zlib library" OFF)
 if(GEANT4_USE_SYSTEM_PTL)
   find_package(PTL REQUIRED)
   # Backward compatibility for sources.cmake using the variable
-  set(PTL_LIBRARIES PTL::PTL)
+  set(PTL_LIBRARIES PTL::ptl)
   geant4_save_package_variables(PTL PTL_DIR)
 else()
   set(PTL_USE_TBB ${GEANT4_USE_TBB})