Import Geant4 10.0.1 source tree

Author: gcosmo

CMakeLists.txt

@@ -3,7 +3,7 @@
 #
 # 21st September 2010 Ben Morgan
 #
-# $Id: CMakeLists.txt 78013 2013-12-02 12:51:57Z gcosmo $
+# $Id: CMakeLists.txt 79108 2014-02-17 09:54:05Z gcosmo $
 #
 
 #------------------------------------------------------------------------------
@@ -51,10 +51,10 @@ set(CMAKE_MODULE_PATH
 # See the documentation in each of these modules for further details.
 #
 # - Versioning. We do this here for now
-set(${PROJECT_NAME}_VERSION "10.0.0")
+set(${PROJECT_NAME}_VERSION "10.0.1")
 set(${PROJECT_NAME}_VERSION_MAJOR "10")
 set(${PROJECT_NAME}_VERSION_MINOR "0")
-set(${PROJECT_NAME}_VERSION_PATCH "0")
+set(${PROJECT_NAME}_VERSION_PATCH "1")
 
 # - Provide dependent options as these are needed for some Geant4 features
 include(CMakeDependentOption)

ReleaseNotes/Patch4.10.0-1.txt

@@ -30,6 +30,42 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
      * Reverse chronological order (last date on top), please *
 
      ----------------------------------------------------------
+
+18th February 2014 - Ben Morgan (cmake-V09-06-46)
+- Modules/Geant4ConfigureConfigScript.cmake : Export use of builtin
+  zlib or otherwise to geant4-config (Bugfix #1572).
+- Template/geant4-config.in : Add builtin zlib to list of features, 
+  adding G4zlib to list of libraries when used (Bugfix #1572).
+- Template/geant4-config.in : Replace use of GNU awk extension 'length'
+  for determining number of datasets. Use return value of split function
+  to get length of array. Problem reported on Hypernews:
+  http://hypernews.slac.stanford.edu/HyperNews/geant4/get/installconfig/1614.html
+
+17th February 2014 - Ben Morgan
+- Templates/geant4make-skeleton.in : Add variables for 
+  G4LIB_{BUILD,USE}_EXPAT as for ZLIB. Fixes Bug #1567
+- Modules/Geant4ToolchainBackwardCompatibility.cmake : Export 
+  G4LIB_{BUILD,USE}_EXPAT based on value of GEANT4_USE_SYSTEM_EXPAT.
+  Fixes Bug #1567.
+
+21st January 2014 - Jonathan Madsen
+- Updated Modules/Geant4InterfaceOptions.cmake to include /opt/X11
+   paths that are now the standard places for X11 and OpenGL on Mac OSX
+   as of Mavericks (OS X 10.9). Without these paths configuring CMake with 
+   GEANT4_USE_OPENGL_X11=ON fails
+
+18th December 2013 - Gunter Folger
+- Modules/Geant4TestDriver.cmake: CTEST_TEST_TIMEOUT is empty, or 
+   its setting is not visible. 
+	Directly using environment variable CTEST_TIMEOUT finally works. 
+
+16th December 2013 - Gunter Folger
+- Modules/Geant4TestDriver.cmake: fix typo introduced in previous tag
+
+16th December 2013 - Gunter Folger
+- Modules/Geant4TestDriver.cmake: use CTEST_TEST_TIMEOUT if set to set
+  default timeout
+
 28th November 2013 - Ben Morgan (cmake-V09-06-45)
 - Modules/Geant4CTest.cmake : Remove G4ENSDFSTATE dataset from list
   exported to the testing environment, as it should not be used by

cmake/History

@@ -98,6 +98,13 @@ if(NOT GEANT4_BUILD_GRANULAR_LIBS AND UNIX)
     set(G4_BUILTWITH_EXPAT "yes")
   endif()
 
+  # - ZLIB
+  if(GEANT4_USE_SYSTEM_ZLIB)
+    set(G4_BUILTWITH_ZLIB "no")
+  else()
+    set(G4_BUILTWITH_ZLIB "yes")
+  endif()
+
   # - GDML
   if(GEANT4_USE_GDML)
     set(G4_BUILTWITH_GDML "yes")

cmake/Modules/Geant4ConfigureConfigScript.cmake

@@ -203,13 +203,15 @@ if(UNIX)
         /usr/openwin/include
         /usr/openwin/share/include
         /opt/graphics/OpenGL/include
+        /opt/X11/include
         )
 
     set(X11_LIB_SEARCH_PATH
         /usr/pkg/xorg/lib
         /usr/X11R6/lib
         /usr/X11R7/lib
         /usr/openwin/lib
+        /opt/X11/lib
         )
 
     find_path(X11_Xmu_INCLUDE_PATH X11/Xmu/Xmu.h ${X11_INC_SEARCH_PATH})
@@ -252,17 +254,17 @@ if(UNIX)
       set(CMAKE_FIND_FRAMEWORK NEVER)
 
       find_path(OPENGL_X11_INCLUDE_DIR GL/gl.h
-        PATHS /usr/X11R6/include
+        PATHS /usr/X11R6/include /opt/X11/include
         NO_DEFAULT_PATH
         )
 
       find_library(OPENGL_X11_gl_LIBRARY GL
-        PATHS /usr/X11R6/lib
+        PATHS /usr/X11R6/lib /opt/X11/lib
         NO_DEFAULT_PATH
         )
 
       find_library(OPENGL_X11_glu_LIBRARY GLU
-        PATHS /usr/X11R6/lib
+        PATHS /usr/X11R6/lib /opt/X11/lib
         NO_DEFAULT_PATH
         )
 

cmake/Modules/Geant4InterfaceOptions.cmake

@@ -53,7 +53,11 @@ endif()
 if(TIM)
   math(EXPR _timeout "${TIM} - 120")
 else()
-  math(EXPR _timeout "1500 - 120")
+  if(NOT $ENV{CTEST_TIMEOUT} STREQUAL "")
+     math(EXPR _timeout "$ENV{CTEST_TIMEOUT} - 120")
+  else()	  
+     math(EXPR _timeout "1500 - 120")
+  endif()	  
 endif()
 
 if(CWD)

cmake/Modules/Geant4TestDriver.cmake

@@ -339,6 +339,13 @@ macro(_g4tc_configure_tc_variables SHELL_FAMILY SCRIPT_NAME)
     set(GEANT4_TC_G4LIB_USE_CLHEP "# USING INTERNAL CLHEP")
   endif()
 
+  # - EXPAT
+  if(GEANT4_USE_SYSTEM_EXPAT)
+    set(GEANT4_TC_G4LIB_USE_EXPAT "# USING SYSTEM EXPAT")
+  else()
+    _g4tc_setenv_command(GEANT4_TC_G4LIB_USE_EXPAT ${SHELL_FAMILY} G4LIB_USE_EXPAT 1)
+  endif()
+
   # - ZLIB...
   if(GEANT4_USE_SYSTEM_ZLIB)
     set(GEANT4_TC_G4LIB_USE_ZLIB "# USING SYSTEM ZLIB")

cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake

@@ -135,6 +135,14 @@ if test "x${have_expat}" = "xyes" ; then
   libs="${libs} -lG4expat"
 fi
 
+# - ZLIB
+have_zlib="@G4_BUILTWITH_ZLIB@"
+feature_list="${feature_list} zlib[${have_zlib}]"
+
+if test "x${have_zlib}" = "xyes" ; then
+  libs="${libs} -lG4zlib"
+fi
+
 # - GDML
 have_gdml="@G4_BUILTWITH_GDML@"
 feature_list="${feature_list} gdml[${have_gdml}]"
@@ -226,9 +234,13 @@ fi
 # Datasets
 # - List creation for sh compatibility, see:
 #    https://wiki.ubuntu.com/DashAsBinSh
+# Note however that the guide in the link uses the GNU awk extension
+# 'length' to find the number of elements in the array. This will fail
+# on other awk implementations. Use standard feature of split function
+# returning number of elements.
 dataset_url="@GEANT4_DATASETS_URL@"
 dataset_timeout="@GEANT4_INSTALL_DATA_TIMEOUT@"
-dataset_list=$(awk 'BEGIN { split( "@GEANT4_CONFIG_DATASET_DESCRIPTIONS@", array, ";"); for (i=1;i<=length(array);i++) { print array[i]; } }')
+dataset_list=$(awk 'BEGIN { n = split( "@GEANT4_CONFIG_DATASET_DESCRIPTIONS@", array, ";"); for (i=1;i<=n;i++) { print array[i]; } }')
 
 #-----------------------------------------------------------------------
 # function print_datasets

cmake/Templates/geant4-config.in

@@ -41,9 +41,9 @@
 @GEANT4_TC_UNSET_COMMAND@  CLHEP_LIB
 @GEANT4_TC_UNSET_COMMAND@  CLHEP_LIB_DIR
 
-# - G3ToG4
-@GEANT4_TC_UNSET_COMMAND@  G4LIB_BUILD_G3TOG4
-@GEANT4_TC_UNSET_COMMAND@  G4LIB_USE_G3TOG4
+# - EXPAT options
+@GEANT4_TC_UNSET_COMMAND@  G4LIB_BUILD_EXPAT
+@GEANT4_TC_UNSET_COMMAND@  G4LIB_USE_EXPAT
 
 # - ZLIB options
 @GEANT4_TC_UNSET_COMMAND@  G4LIB_BUILD_ZLIB
@@ -54,6 +54,10 @@
 @GEANT4_TC_UNSET_COMMAND@  G4LIB_USE_GDML
 @GEANT4_TC_UNSET_COMMAND@  XERCESCROOT
 
+# - G3ToG4
+@GEANT4_TC_UNSET_COMMAND@  G4LIB_BUILD_G3TOG4
+@GEANT4_TC_UNSET_COMMAND@  G4LIB_USE_G3TOG4
+
 # - UI Build and Use options
 # USE options only for applications.
 @GEANT4_TC_UNSET_COMMAND@  G4UI_NONE
@@ -154,6 +158,10 @@
 @GEANT4_TC_CLHEP_LIB_DIR@
 @GEANT4_TC_CLHEP_LIB_PATH_SETUP@
 
+#-----------------------------------------------------------------------
+# EXPAT setup
+@GEANT4_TC_G4LIB_USE_EXPAT@
+
 #-----------------------------------------------------------------------
 # ZLIB Setup
 #

cmake/Templates/geant4make-skeleton.in

@@ -1,4 +1,4 @@
-svn log $Id: History 77473 2013-11-25 09:32:54Z gcosmo $
+svn log $Id: History 79120 2014-02-18 14:50:37Z gcosmo $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,12 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+17th January 2014   Gabriele Cosmo  (config-V09-06-18)
+- Fixed setting of -fPIC also for Darwin targets.
+
+13th January 2014   Gabriele Cosmo
+- Fixed setting of -fPIC in MT-mode for Linux-g++ and Linux-icc.
+
 25th November 2013   Gabriele Cosmo  (config-V09-06-17)
 - Corrected settings for Linux-g++ and Linux-icc in the use of -fPIC in
   multi-threaded mode.