Merge pull request #8564 from cms-sw/smuzaffar-patch-3

Geant4: cleanup unused variables and use GEANT4_USE_USOLIDS="all"

geant4.spec

@@ -43,8 +43,6 @@ export VecGeom_DIR=${VECGEOM_ROOT}/lib/cmake/VecGeom
 cmake ../%{n}.%{realversion} \
   -DCMAKE_CXX_COMPILER="g++" \
   -DCMAKE_CXX_FLAGS="%{build_flags}" \
-  -DCMAKE_STATIC_LIBRARY_CXX_FLAGS="%{build_flags}" \
-  -DCMAKE_STATIC_LIBRARY_C_FLAGS="%{build_flags}" \
   -DCMAKE_AR=$(which gcc-ar) \
   -DCMAKE_RANLIB=$(which gcc-ranlib) \
   -DCMAKE_INSTALL_PREFIX:PATH="%i" \
@@ -54,10 +52,9 @@ cmake ../%{n}.%{realversion} \
   -DGEANT4_BUILD_TLS_MODEL:STRING="global-dynamic" \
   -DGEANT4_ENABLE_TESTING=OFF \
   -DGEANT4_BUILD_VERBOSE_CODE=OFF \
-  -DGEANT4_USE_USOLIDS-ADVANCED:INTERNAL=1 \
   -DGEANT4_BUILD_BUILTIN_BACKTRACE=OFF \
 %if %{use_vecgeom}
-  -DGEANT4_USE_USOLIDS="CONS;POLYCONE;POLYHEDRA" \
+  -DGEANT4_USE_USOLIDS="all" \
 %endif
   -DBUILD_SHARED_LIBS=ON \
   -DBUILD_STATIC_LIBS=ON \