Import Geant4 10.4.1 source tree

cmake/History

@@ -31,6 +31,24 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
 
      ----------------------------------------------------------
 
+26th February 2018 - Ben Morgan (cmake-V10-03-53, 52)
+- Geant4InstallData.cmake, Geant4CTest.cmake: Update URL for downloads 
+  to "cern.ch/geant4-data" as the correct alias to new EOS area, seperate
+  from main website. Superceeds cmake-V10-03-51.
+
+26th February 2018 - Ben Morgan (cmake-V10-03-51)
+- Geant4InstallData.cmake, Geant4CTest.cmake: Update URL for downloads 
+  to "cern.ch/geant4" as the correct alias.
+
+26th February 2018 - Ben Morgan (cmake-V10-03-50)
+- G4BuildSettings.cmake: Add 17/c++17 to C++ standards against which
+  Geant4 can be compiled. Will require a minimum CMake version of
+  3.8 to enable, but this is not checked.
+
+8th December 2017 - Ben Morgan
+- Templates/UseGeant4_internal.cmake: When running test driver directly,
+  make it run in WORKING_DIRECTORY if this is supplied.
+
 30th November 2017 - Gabriele Cosmo (cmake-V10-03-49)
 - Replaced USolids specific flags with VecGeom in Geant4OptionalComponents.cmake.
   From now on VecGeomConfig.cmake will be required and used instead of

cmake/Modules/G4BuildSettings.cmake

@@ -143,13 +143,13 @@ endif() #NOT WIN32
 #
 
 #.rst
-# - ``GEANT4_BUILD_CXXSTD`` (Allowed values: 11, 14, c++11, c++14)
+# - ``GEANT4_BUILD_CXXSTD`` (Allowed values: 11, 14, 17, c++11, c++14, c++17)
 #
 #   - Choose C++ Standard to build against from supported list.
 #
 enum_option(GEANT4_BUILD_CXXSTD
   DOC "C++ Standard to compile against"
-  VALUES 11 14 c++11 c++14
+  VALUES 11 14 17 c++11 c++14 c++17
   CASE_INSENSITIVE
   )
 
@@ -189,7 +189,7 @@ if(GEANT4_BUILD_CXXSTD GREATER 11)
   if(CMAKE_CXX${GEANT4_BUILD_CXXSTD}_COMPILE_FEATURES)
     list(APPEND GEANT4_TARGET_COMPILE_FEATURES ${CMAKE_CXX${GEANT4_BUILD_CXXSTD}_COMPILE_FEATURES})
   else()
-    message(FATAL_ERROR "Geant4 requested to be compiled against C++ standard '${GEANT4_BUILD_CXXSTD}'\nbut detected compiler '${CMAKE_CXX_COMPILER_ID}', version '${CMAKE_CXX_COMPILER_VERSION}'\ndoes not support any features of that standard")
+    message(FATAL_ERROR "Geant4 requested to be compiled against C++ standard '${GEANT4_BUILD_CXXSTD}'\nbut detected compiler '${CMAKE_CXX_COMPILER_ID}', version '${CMAKE_CXX_COMPILER_VERSION}'\ndoes not support, or CMake (${CMAKE_VERSION}) is not aware of, any features of that standard.")
   endif()
 endif()
 

cmake/Modules/Geant4CTest.cmake

@@ -33,7 +33,7 @@ if(GEANT4_ENABLE_TESTING)
   endforeach()
 
   # - Add base URL for test reference files
-  set (GEANT4_TEST_REFERENCES_URL "http://geant4.cern.ch/stt/references/" CACHE
+  set (GEANT4_TEST_REFERENCES_URL "http://cern.ch/geant4-data/stt/references/" CACHE
        STRING "base URL for test reference files")
   mark_as_advanced(GEANT4_TEST_REFERENCES_URL)
 

cmake/Modules/Geant4InstallData.cmake

@@ -99,7 +99,7 @@
 # retrieving them globally
 #-----------------------------------------------------------------------
 # Geant4 Data Repository
-set(GEANT4_DATASETS_URL "http://geant4.cern.ch/support/source")
+set(GEANT4_DATASETS_URL "http://cern.ch/geant4-data/datasets")
 
 # Where to install data in the build tree
 set(GEANT4_BUILD_FULL_DATADIR ${PROJECT_BINARY_DIR}/data)

cmake/Templates/UseGeant4_internal.cmake

@@ -223,6 +223,12 @@ function(geant4_add_test test)
     if(ARG_FAILREGEX)
       set_property(TEST ${test} PROPERTY FAIL_REGULAR_EXPRESSION ${ARG_FAILREGEX})
     endif()
+
+    # If WORKING_DIRECTORY supplied, make sure testdriver is run in
+    # that directory.
+    if(ARG_WORKING_DIRECTORY)
+      set_property(TEST ${test} PROPERTY WORKING_DIRECTORY "${ARG_WORKING_DIRECTORY}")
+    endif()
   endif()
 
   #- Handle TIMOUT and DEPENDS arguments