Merge pull request #8226 from cms-sw/g4_vecgeom-11.1

[G4][VecGeom] Update Geant4 11.1.0 and build g4/dd4hep with default flags
cms-sw · Dec 13, 2022 · 3dcdc8b · 3dcdc8b
2 parents a913ad3 + f45dba0
commit 3dcdc8b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/dd4hep.spec b/dd4hep.spec
@@ -16,7 +16,6 @@ Requires: root boost clhep xerces-c geant4
   -DDD4HEP_USE_PYROOT=ON \\\
   -DCMAKE_CXX_STANDARD=17 \\\
   -DCMAKE_BUILD_TYPE=Release \\\
-  -DCMAKE_CXX_FLAGS_RELEASE='-O2 -DNDEBUG' \\\
   -DDD4HEP_USE_GEANT4_UNITS=ON \\\
   -DXERCESC_ROOT_DIR=${XERCES_C_ROOT} \\\
   -DCMAKE_PREFIX_PATH="${CLHEP_ROOT};${XERCES_C_ROOT}"

diff --git a/geant4.spec b/geant4.spec
@@ -1,6 +1,6 @@
-### RPM external geant4 11.0.10
+### RPM external geant4 11.1.0
 ## INCLUDE compilation_flags
-%define tag fdd5cd70ae299ffa162cf274eba2638bd9b008aa
+%define tag 9f34590941fb8a3f7ad139731089ec3794947545
 %define branch cms/v%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz
@@ -51,7 +51,6 @@ cmake ../%{n}.%{realversion} \
   -DCMAKE_INSTALL_PREFIX:PATH="%i" \
   -DCMAKE_CXX_STANDARD:STRING="17" \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" \
   -DGEANT4_USE_GDML=ON \
   -DGEANT4_BUILD_TLS_MODEL:STRING="global-dynamic" \
   -DGEANT4_ENABLE_TESTING=OFF \