Merge pull request #6612 from cms-sw/smuzaffar-patch-4

[DD4hep] Update to latest commit v01-15x

dd4hep-toolfile.spec

@@ -21,7 +21,8 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/dd4hep-core.xml
   </client>
   <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
   <runtime name="PATH" value="$DD4HEP_CORE_BASE/bin" type="path"/>
-  <flags LISTCOMPONENTS="$(DD4HEP_CORE_BASE)/bin/listcomponents"/>
+  <flags LISTCOMPONENTS="$(DD4HEP_CORE_BASE)/bin/listcomponents_dd4hep"/>
+  <flags cppdefines="DD4HEP_USE_GEANT4_UNITS=1"/>
   <use name="root_cxxdefaults"/>
   <use name="root"/>
   <use name="boost"/>

dd4hep.spec

@@ -1,6 +1,6 @@
-### RPM external dd4hep v01-14x
+### RPM external dd4hep v01-15x
 
-%define tag 934ce101148be15cce7725caad8c25084a272938
+%define tag 2ee30aa3a76858d14f9deea8e0f36b2b69ca8365
 %define branch master
 %define github_user AIDASoft
 %define keep_archives true
@@ -23,8 +23,8 @@ CMAKE_ARGS="-DCMAKE_INSTALL_PREFIX='%{i}' \
       -DDD4HEP_USE_PYROOT=ON \
       -DCMAKE_CXX_STANDARD=17 \
       -DCMAKE_BUILD_TYPE=Release \
-      -DDD4HEP_USE_TBB=ON \
-      -DCMAKE_PREFIX_PATH=${TBB_ROOT}/cmake/TBB;${CLHEP_ROOT};${XERCES_C_ROOT}"
+      -DDD4HEP_USE_GEANT4_UNITS=ON \
+      -DCMAKE_PREFIX_PATH=${CLHEP_ROOT};${XERCES_C_ROOT}"
 
 #Build normal Shared D4Hep without Geant4
 rm -rf ../build; mkdir ../build; cd ../build