Update Geant4

CHANGELOG.md

@@ -14,6 +14,12 @@ Until May 2022 (inclusive) no changelog was kept. We might try to reconstruct it
 
 ### Changed
 
+* Geant4: Update to 11.4.0
+* Geant3: Update to 4-4
+* Geant4_VMC: Update to 6-6
+* VGM: Update to 5-2
+* VMC: Update to 2-1
+
 ### Removed
 
 ## [25.11](https://github.com/ShipSoft/shipdist/tree/25.11)

fairroot.sh

@@ -53,14 +53,11 @@ cmake $SOURCEDIR
       -DCMAKE_CXX_FLAGS="$CXXFLAGS"                                                         \
       ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE}                             \
       -DROOTSYS=$ROOTSYS                                                                    \
-      -DROOT_CONFIG_SEARCHPATH=$ROOT_ROOT/bin                                               \
       -DPythia6_LIBRARY_DIR=$PYTHIA6_ROOT/lib                                               \
       ${YAML_CPP_ROOT:+-DYAML_CPP_ROOT=$YAML_CPP_ROOT}                                      \
       -DGeant3_DIR=$GEANT3_ROOT                                                             \
-      -DDISABLE_GO=ON                                                                       \
       -DBUILD_EXAMPLES=ON                                                                   \
       ${GEANT4_ROOT:+-DGeant4_DIR=$GEANT4_ROOT}                                             \
-      -DFAIRROOT_MODULAR_BUILD=ON                                                           \
       ${BOOST_ROOT:+-DBOOST_ROOT=$BOOST_ROOT}                                               \
       -DBoost_NO_SYSTEM_PATHS=${BOOST_NO_SYSTEM_PATHS}                                      \
       ${GSL_ROOT:+-DGSL_DIR=$GSL_ROOT}                                                      \

geant3.sh

@@ -1,6 +1,6 @@
 package: GEANT3
 version: "%(tag_basename)s"
-tag: v3-9
+tag: v4-4
 requires:
   - ROOT
   - VMC

geant4.sh

@@ -1,6 +1,6 @@
 package: GEANT4
 version: "%(tag_basename)s"
-tag: v10.7.3
+tag: v11.4.0
 source: https://github.com/geant4/geant4.git
 requires:
   - "GCC-Toolchain:(?!osx)"

geant4_vmc.sh

@@ -1,6 +1,6 @@
 package: GEANT4_VMC
 version: "%(tag_basename)s"
-tag: "v5-4"
+tag: "v6-6"
 source: https://github.com/vmc-project/geant4_vmc
 requires:
   - ROOT
@@ -33,6 +33,7 @@ LDFLAGS="$LDFLAGS -L$GEANT4_ROOT/lib"            \
     -DCMAKE_INSTALL_LIBDIR=lib                   \
     -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"        \
     -DCMAKE_POLICY_DEFAULT_CMP0074=NEW \
+    ${XERCESC_ROOT:+-DXercesC_ROOT=$XERCESC_ROOT} \
     ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD}
 
 make ${JOBS+-j $JOBS} install

vgm.sh

@@ -1,6 +1,6 @@
 package: vgm
 version: "%(tag_basename)s%(defaults_upper)s"
-tag: "v4-9"
+tag: "v5-2"
 source: https://github.com/vmc-project/vgm.git
 requires:
   - ROOT
@@ -32,7 +32,10 @@ cmake "$SOURCEDIR" \
   -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"  \
   -DWITH_EXAMPLES=OFF                \
   -DWITH_TEST=OFF                     \
+  ${XERCESC_ROOT:+-DXercesC_ROOT=$XERCESC_ROOT} \
+  -DCMAKE_POLICY_DEFAULT_CMP0074=NEW \
   -DBUILD_SHARED_LIBS=OFF
+#  ${XERCESC_ROOT:+-DXercesC_INCLUDE_DIR=$XERCESC_ROOT/include -DXercesC_LIBRARY=$XERCESC_ROOT/lib} \
 
 make ${JOBS+-j $JOBS} install
 

vmc.sh

@@ -1,6 +1,6 @@
 package: VMC
 version: "%(tag_basename)s"
-tag: "v1-1-p1"
+tag: "v2-1"
 source: https://github.com/vmc-project/vmc
 requires:
   - ROOT