Import Geant4 10.7.0.beta source tree

CMakeLists.txt

@@ -22,7 +22,7 @@ cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
 
 # - Make overrides for default flags, so they appear in interfaces
 set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
-   ${CMAKE_SOURCE_DIR}/cmake/Modules/Geant4MakeRules_cxx.cmake)
+   ${CMAKE_SOURCE_DIR}/cmake/Modules/G4MakeRules_cxx.cmake)
 
 #-----------------------------------------------------------------------
 # - Project definition and basic configuration
@@ -31,8 +31,8 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX
 #   the same form.
 project(Geant4)
 set(${PROJECT_NAME}_VERSION_MAJOR 10)
-set(${PROJECT_NAME}_VERSION_MINOR  6)
-set(${PROJECT_NAME}_VERSION_PATCH  2)
+set(${PROJECT_NAME}_VERSION_MINOR  7)
+set(${PROJECT_NAME}_VERSION_PATCH  0)
 set(${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}")
 
 # - Prepend our own CMake Modules to the search path

ReleaseNotes/Patch4.10.6-1.txt

@@ -33,8 +33,8 @@ List of fixes included in this public patch since the public release 10.6:
       o Turn off verbosity flags by default in G4IntegratorDriver,
         G4InterpolationDriver and G4MagIntegratorDriver.
     + navigation:
-      o Avoid looping infinitely by pushing N times with increasing step size.
-        Addressing problem report #2196.
+      o Avoid looping infinitely in G4RegularNavigation by pushing N times
+        with increasing step size. Addressing problem report #2196.
     + solids/specific:
       o Re-established parameterisation mechanism for G4Tet and G4UTet which was
         removed by mistake. Addressing problem report #2209.

cmake/History

@@ -29,46 +29,130 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
      * Reverse chronological order (last date on top), please *
 
      ----------------------------------------------------------
-21st April 2020 - Ben Morgan (cmake-V10-05-39)
-- BUGFIX: Only store variables in Geant4PackageCache if they have
-  a value.
 
-6th April 2020 - Ben Morgan (cmake-V10-05-38)
+17th June 2020 - Jonathan Madsen (cmake-V10-06-25)
+- Moved TBB before PTL
+- Forced PTL_USE_TBB to be set to GEANT4_USE_TBB when not
+  using system PTL
+- Added Geant4::G4ptl ALIAS targets for build tree testing
+- Added support for building G4ptl, GEANT4_USE_TBB option
+- Updated FindTBB.cmake to be more robust
+- Updates to PTL internal/external handling
+- fixed PTL find_dependency
+
+15th June 2020 - Gunter Folger (cmake-V10-06-24)
+- Switch to G4EMLOW 7.12
+
+8th June 2020 - Ben Morgan (cmake-V10-06-23)
+- Default GEANT4_USE_NEW_CMAKE to ON to use new build organization
+  as the primary system.
+- Fix bug in setting of AUTOMOC
+- Handle install of G4clhep{-static} independently of main modules
+  due it being built outside the category system.
+- Retain GEANT4_BUILDTREE_INCLUDE_DIRS in new CMake system to support
+  clients that may not yet support CMake target usage requirements.
+- Protect recursion into tests module on existence of the directory
+
+2nd June 2020 - Guilherme Amadio (cmake-V10-06-22)
+- Avoid warnings from propagating CMAKE_DISABLE_FIND_PACKAGE_ROOT
+  down to tests.
+
+30th May 2020 - Ben Morgan (cmake-V10-06-21)
+- Modules/Geant4DeveloperAPI.cmake: Import new "target" style API for
+  declaring and composing libraries from modules of source code.
+  Provide GEANT4_USE_NEW_CMAKE option, OFF by default, to switch between
+  systems.
+
+28th May 2020 - Gunter Folger (cmake-V10-06-20)
+- Switch to G4EMLOW 7.11
+
+26th May 2020 - Ben Morgan (cmake-V10-06-19)
+- Use "VecGeom::vecgeom" as imported target name for VecGeom library
+  to bring in line with upstream master of VecGeom. Export VecCore_DIR
+  if it is set to package cache file, as new VecGeomConfig needs to refind
+  VecCore.
+
+20 May 2020 - Frederick Jones (cmake-V10-06-18)
+- Modules/G4InterfaceOptions.cmake: added GEANT4_USE_XM to Open
+  Inventor X driver code block to correct Xm and Xt link order.
+
+19th May 2020 - Guilherme Amadio (cmake-V10-06-17)
+- Propagate value of CMAKE_DISABLE_FIND_PACKAGE_ROOT down to tests
+  that optionally support ROOT to allow testing Geant4 with ROOT support
+  disabled. This is necessary when testing Geant4 with a different C++
+  standard than ROOT when it's installed.
+
+29th April 2020 - Ben Morgan (cmake-V10-06-16)
+- Add GEANT4_USE_NEW_CMAKE option in preparation for testing of modular
+  build updates. Added now to suppress Continuous warnings
+
+22 April 2020 - Frederick Jones (cmake-V10-06-15)
+- Modules/G4InterfaceOptions.cmake, Templates/Geant4Config.cmake.in:
+  Added support for Open Inventor Qt Vis driver to be built
+  and used in applications.  The library can be built with the
+  OIQT driver, or with the OIX/OIXE drivers, but not both.
+
+6th April 2020 - Ben Morgan (cmake-V10-06-14)
 - Activate build of geant4py when GEANT4_USE_PYTHON is set
   Check that MT builds use global-dynamic TLS to allow Python
   module loading of the Geant4 dynamic libraries.
 
-3rd April 2020 - Guilherme Amadio (cmake-V10-05-37)
+21st April 2020 - Ben Morgan (cmake-V10-06-13)
+- BUGFIX: Only store variables in Geant4PackageCache if they have
+  a value.
+
+20th April 2020 - Ben Morgan (cmake-V10-06-12)
+- Remove Qt4 support
+
+17th April 2020 - Ben Morgan (cmake-V10-06-11)
+- Add GEANT4_USE_PYTHON option to suppress Continuous warnings
+
+3rd April 2020 - Guilherme Amadio (cmake-V10-06-10)
 - Use full path to datasets if GEANT4_INSTALL_DATADIR is an absolute path
 
-2nd April 2020 - Guilherme Amadio (cmake-V10-05-36)
+2nd April 2020 - Guilherme Amadio (cmake-V10-06-09)
 - Customize CMAKE_INSTALL_DATADIR in a single location
 
-18th March 2020 - Gunter Folger (cmake-V10-05-35)
+18th March 2020 - Gunter Folger (cmake-V10-06-08)
 - In Modules/G4CPack.cmake suppress warnings about icc libraries not existing
   for Intel icc version 19.
 
-14th February 2020 - Ben Morgan (cmake-V10-05-34)
+16th March 2020 - Gunter Folger (cmake-V10-06-07)
+- Switch to G4EMLOW 7.10
+
+14th February 2020 - Ben Morgan (cmake-V10-06-06)
 - No longer create gnumake symlinks on Windows
   Windows permissions may prevent creation of symlinks, leading to
   errors at install time. As gnumake is no longer supported on
   Windows, protect symlink creation with test on host platform.
 
-5th February 2020 - Ben Morgan (cmake-V10-05-33)
-- Apply patch from TXCorp to allow compilation on Windows using Clang
-
-4th February 2020 - Ben Morgan (cmake-V10-05-32)
+4th February 2020 - Ben Morgan (cmake-V10-06-05)
 - BUGFIX 2221
   Use "${FOO:-}" variable expansion and "-z" test to check for
   undefined variables in Bourne Shell scripts. Prevents errors when
   shell is in "set -u" mode. Report and patch supplied by Michael Reilly
 
-28th January 2020 - Gunter Folger (cmake-V10-05-31)
-- Switch to patched dataset for G4EMLOW 7.9.1
+27th January 2020 - Gunter Folger (cmake-V10-06-04)
+- Switch to G4EMLOW 7.9.1
 
-15th January 2020 - Ben Morgan (cmake-V10-05-30)
+15th January 2020 - Ben Morgan (cmake-V10-06-03)
 - Quote VECGEOM_COMPILE_DEFINITIONS to avoid incorrect argument errors
 
+6th January 2020 - Ben Morgan (cmake-V10-06-02)
+- Apply patch from TXCorp to allow compilation on Windows using Clang
+
+12th December 2019 - Ben Morgan (cmake-V10-06-01)
+- Remove requirement on presence of XQuartz GLU library
+- No longer save glu related variables in the package cache
+
+6th December 2019 - Ben Morgan (cmake-V10-06-00)
+- Remove obsolete Geant4Wrapping module in preparation for full G4Py
+  build support
+- Rename remaining internal "Geant4..." modules to "G4" convention
+  Retain Geant4DefineModule and Geant4LibraryTargets until new modularization
+  scheme in place.
+- Format G4ClangFormat
+
 25th November 2019 - Ben Morgan (cmake-V10-05-29)
 - Disable configuration of Wt UI/Vis driver due to it no longer
   compiling with recent Wt versions

cmake/Modules/CMakeUninstallTarget.cmake

@@ -8,7 +8,7 @@
 #
 #
 
-function(WRITE_UNINSTALL_TARGET_SCRIPT)
+function(write_uninstall_target_script)
     # Create uninstall target template file, if it doesn't exist...
     if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in)
         set(__uninstall_filename ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake.in)
@@ -42,10 +42,8 @@ endforeach(file)
     endif()
 endfunction()
 
-
-
 # Call the file writing function, if needed
-WRITE_UNINSTALL_TARGET_SCRIPT()
+write_uninstall_target_script()
 
 # Configure the file that reads the install manifest and processes the files
 configure_file(
@@ -56,5 +54,3 @@ configure_file(
 # Add the uninstall target
 add_custom_target(uninstall
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-
-

cmake/Modules/FindStatTest.cmake

@@ -2,14 +2,14 @@
 # - Find StatTest
 # This module tries to find the StatTest application
 # Once done this will define
-# 
+#
 #	STATTEST_FOUND    - Application found
 #	STATTEST_APP      - Application
 #   STATTEST_CMD      - Command line to run the application
 #   STATTEST_ADD_TEST - Helper function to define a ctest using
 #      			          StatTest (Only if we are using for G4 testing)
 #
-# Variables used by this module, which can change the default behaviour 
+# Variables used by this module, which can change the default behaviour
 # and need to be set before calling find_package
 #
 #	STATTEST_ROOT_DIR	Root directory to StatTest package
@@ -22,7 +22,7 @@ if(NOT GEANT4_ENABLE_TESTING)
 endif()
 
 #Search application
-#Note that the second suggested path is G4 specific... 
+#Note that the second suggested path is G4 specific...
 find_path(STATTEST_APP_DIR
 		NAMES StatTestVersion.py
 		PATHS ${STATTEST_ROOT_DIR} ${CMAKE_SOURCE_DIR}/verification/StatTest
@@ -43,7 +43,7 @@ if(NOT ROOT_FOUND)
   set(_root_isok FALSE)
 else()
   set(_root_isok TRUE)
-  # - Check if python interpreter is correct version 
+  # - Check if python interpreter is correct version
   # (the one compatible with root)
   find_package(PythonInterp ${ROOT_PYTHONVER} QUIET)
   if(NOT PYTHONINTERP_FOUND)
@@ -70,9 +70,9 @@ if(STATTEST_FOUND)
   set(STATTEST_APP ${STATTEST_APP_DIR}/runtests.py)
   set(STATTEST_CMD ${PYTHON_EXECUTABLE} ${STATTEST_APP})
 
-  # Let's create a function that helps in building tests for 
+  # Let's create a function that helps in building tests for
   # regression testing
-  # function STATTEST_ADD_TEST(<name> 
+  # function STATTEST_ADD_TEST(<name>
   #	   		                     G4TEST testname
   #                            CONFIG conffile
   #                            INPUT inputfile
@@ -82,7 +82,7 @@ if(STATTEST_FOUND)
   #                            [LABELS label1 label2 ...]
   #                            [IMG filename])
   function(STATTEST_ADD_TEST stattest)
-        CMAKE_PARSE_ARGUMENTS(ARG "DEBUG;TEXT" 
+        CMAKE_PARSE_ARGUMENTS(ARG "DEBUG;TEXT"
         "CONFIG;INPUT;REFERENCE;G4TEST;IMG"
         "LABELS" ${ARGN}
     )
@@ -91,12 +91,12 @@ if(STATTEST_FOUND)
     if(_len LESS 1)
         message(FATAL_ERROR "STATTEST_ADD_TEST: conffile is mandatory")
     endif()
-      
+
     list(LENGTH ARG_INPUT _len)
     if(_len LESS 1)
         message(FATAL_ERROR "STATTEST_ADD_TEST: inputfile is mandatory")
     endif()
-      
+
     list(LENGTH ARG_G4TEST _len)
     if(_len LESS 1)
         message(FATAL_ERROR "STATTEST_ADD_TEST: testname is mandatory")
@@ -108,10 +108,10 @@ if(STATTEST_FOUND)
     else()
         set(_command ${STATTEST_CMD})
     endif()
- 
+
     if(ARG_TEXT)
 	    set(_command ${_command} "-T")
-    endif()	 
+    endif()
 
     #Mandatory parameters
     set(_command ${_command} ${ARG_CONFIG} ${ARG_INPUT})
@@ -125,10 +125,10 @@ if(STATTEST_FOUND)
         set(_labels "")
     endif()
 
-    include(Geant4CTest)
-    
+    include(G4CTest)
+
      #Now build G4 test
-    GEANT4_ADD_TEST(${stattest} 
+    GEANT4_ADD_TEST(${stattest}
         COMMAND ${_command}
         DEPENDS ${ARG_G4TEST}
         LABELS ${_labels}