From 052db9fc47fb32ab48a767995f9b50024a20a516 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Tue, 26 Jan 2021 01:07:25 +0200 Subject: [PATCH] Revert "Update DD4Hep to latest on master" --- dd4hep-toolfile.spec | 1 - dd4hep.spec | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dd4hep-toolfile.spec b/dd4hep-toolfile.spec index b4b3f716ad4..0941f7c07e9 100644 --- a/dd4hep-toolfile.spec +++ b/dd4hep-toolfile.spec @@ -21,7 +21,6 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/dd4hep-core.xml - diff --git a/dd4hep.spec b/dd4hep.spec index 2bcaedc66e6..479614b7480 100644 --- a/dd4hep.spec +++ b/dd4hep.spec @@ -1,6 +1,6 @@ -### RPM external dd4hep v01-15x +### RPM external dd4hep v01-14x -%define tag 12caacb209af70835dbdd48efa7ef8d0b77b3dcd +%define tag 934ce101148be15cce7725caad8c25084a272938 %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_GEANT4_UNITS=ON \ - -DCMAKE_PREFIX_PATH=${CLHEP_ROOT};${XERCES_C_ROOT}" + -DDD4HEP_USE_TBB=ON \ + -DCMAKE_PREFIX_PATH=${TBB_ROOT}/cmake/TBB;${CLHEP_ROOT};${XERCES_C_ROOT}" #Build normal Shared D4Hep without Geant4 rm -rf ../build; mkdir ../build; cd ../build