Import Geant4 10.5.0.beta source tree

cmake/Templates/Geant4Config.cmake.in

@@ -16,7 +16,7 @@
 #                        help setup CMake variables
 #  Geant4_CXXSTD       - C++ Standard used to compile Geant4, e.g. c++98
 #  Geant4_TLS_MODEL    - Thread Local Storage model used. Only set if
-#                        the install provides multithreading support.
+#                        the build used an explicit model.
 #
 # You may supply a version number through find_package which will be checked
 # against the version of this build. Standard CMake logic is used so that
@@ -305,6 +305,9 @@ if(Geant4_multithreaded_FOUND)
 
   # - Define variable to indicate TLS model used
   set(Geant4_TLS_MODEL "@GEANT4_BUILD_TLS_MODEL@")
+  if(Geant4_TLS_MODEL STREQUAL "auto")
+    unset(Geant4_TLS_MODEL)
+  endif()
 endif()
 
 # - Muonic Atom support
@@ -319,6 +322,21 @@ if(Geant4_gdml_FOUND)
   list(REMOVE_ITEM Geant4_FIND_COMPONENTS gdml)
 endif()
 
+# - TiMemory
+set(Geant4_timemory_FOUND @GEANT4_USE_TIMEMORY@)
+if(Geant4_timemory_FOUND)
+    list(REMOVE_ITEM Geant4_FIND_COMPONENTS timemory)
+    list(APPEND Geant4_DEFINITIONS -DGEANT4_USE_TIMEMORY)
+    set(_geant4_timemory_dir "@TiMemory_DIR@")
+    # always use same installation
+    unset(TiMemory_DIR CACHE)
+    set(TiMemory_DIR "${_geant4_timemory_dir}" CACHE PATH
+        "TiMemory installation of Geant4")
+    find_package(TiMemory REQUIRED QUIET)
+    include_directories(${TiMemory_INCLUDE_DIRS})
+    set(_geant4_use_timemory_library ON)
+endif(Geant4_timemory_FOUND)
+
 # - G3toG4
 set(Geant4_g3tog4_FOUND @GEANT4_USE_G3TOG4@)
 if(Geant4_g3tog4_FOUND)
@@ -587,6 +605,11 @@ if(_geant4_use_g3tog4_library)
   set(_geant4_g3tog4_library G3toG4${_geant4_lib_use_suffix})
 endif()
 
+# - link to TiMemory library if activated
+if(_geant4_use_timemory_library)
+  list(APPEND _geant4_internal_libraries ${TiMemory_LIBRARIES})
+endif()
+
 # - Factory registration mechanism in physics_lists requires whole
 # archive to be linked when using static libs, so requires wrapping
 # with suitable compiler dependent flags

cmake/Templates/geant4-config.in

@@ -88,6 +88,9 @@ have_multithreading="@G4_BUILTWITH_MULTITHREADING@"
 feature_list="${feature_list} multithreading[${have_multithreading}]"
 if test "x${have_multithreading}" = "xyes" ; then
   geant4_tls_model="@GEANT4_BUILD_TLS_MODEL@"
+  if test "x${geant4_tls_model}" = "xauto" ; then
+    geant4_tls_model=""
+  fi
   cflags="${cflags} -DG4MULTITHREADED"
 else
   geant4_tls_model=""

cmake/Templates/geant4_validate_sources.cmake.in

@@ -5,7 +5,7 @@
 # We have to parse the sources.cmake files for the headers and sources 
 # because these files use the include_directories command, which is non 
 # scriptable. A simple REGEX is used to find all the .cc, .hh and .icc 
-# files listed in eah sources.cmake file. These lists are compared with 
+# files listed in each sources.cmake file. These lists are compared with 
 # a GLOB of those in the include and src directories of the module 
 # corresponding to the sources.cmake file.
 #
@@ -44,7 +44,7 @@ set(GEANT4_FALSEPOSITIVE_SOURCES
   G4VRML1SceneHandlerFunc.icc
   G4VRML2SceneHandlerFunc.icc
   # - Documentation of processes/hadronic/models/cascade/cascade
-  # lists some sources in in comments. These do not correspond to
+  # lists some sources in comments. These do not correspond to
   # real sources so we can safely filter them
   # TODO : Improve regex to identify comments!!!!
   T1xxChannel.cc
@@ -63,6 +63,9 @@ message(STATUS "Scanning source tree ${GEANT4_SOURCE_TREE}")
 file(GLOB_RECURSE GEANT4_SOURCESCMAKE_FILES
   ${GEANT4_SOURCE_TREE}/*/sources.cmake
   )
+
+list(FILTER GEANT4_SOURCESCMAKE_FILES EXCLUDE REGEX "externals\\/zlib\\/sources.cmake")
+
 list(LENGTH GEANT4_SOURCESCMAKE_FILES GEANT4_SOURCESCMAKE_COUNT)
 message(STATUS "Located ${GEANT4_SOURCESCMAKE_COUNT} sources.cmake files")
 
@@ -70,7 +73,7 @@ message(STATUS "Located ${GEANT4_SOURCESCMAKE_COUNT} sources.cmake files")
 # Parse each modules and process...
 #
 foreach(_sourcesfile ${GEANT4_SOURCESCMAKE_FILES})
-  # - Where are we?
+   # - Where are we?
   get_filename_component(_sourcesfile_location ${_sourcesfile} PATH)
 
   # - Find on disk files...