From aadabe14d4a0ab788ee75e3ca99e72cec1bb9583 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Wed, 1 Jul 2020 10:07:55 +0200
Subject: [PATCH] CI: set DD4HEP_USE_TBB=on for dev branches
---
.dd4hep-ci.d/compile_and_test.sh | 1 +
.dd4hep-ci.d/init_x86_64.sh | 1 +
2 files changed, 2 insertions(+)
diff --git a/.dd4hep-ci.d/compile_and_test.sh b/.dd4hep-ci.d/compile_and_test.sh
index 2e9580837..aecfab400 100755
--- a/.dd4hep-ci.d/compile_and_test.sh
+++ b/.dd4hep-ci.d/compile_and_test.sh
@@ -9,6 +9,7 @@ unset CPATH # causes implicit includes to be added in cmake, preventing setting
cmake -GNinja -DDD4HEP_USE_GEANT4=ON \
-DBoost_NO_BOOST_CMAKE=ON \
-DDD4HEP_USE_LCIO=ON \
+ -DDD4HEP_USE_TBB=${DD4HEP_USE_TBB:-OFF} \
-DBUILD_TESTING=ON \
-DDD4HEP_DEBUG_CMAKE=ON \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/.dd4hep-ci.d/init_x86_64.sh b/.dd4hep-ci.d/init_x86_64.sh
index fb7328303..dd95a268e 100644
--- a/.dd4hep-ci.d/init_x86_64.sh
+++ b/.dd4hep-ci.d/init_x86_64.sh
@@ -50,6 +50,7 @@ fi
if [[ "${LCG_RELEASE}" =~ "dev" ]]; then
LCGREPO=/cvmfs/sft-nightlies.cern.ch/lcg/views/${LCG_RELEASE}/latest
+ export DD4HEP_USE_TBB=ON
else
LCGREPO=/cvmfs/sft.cern.ch/lcg/views/${LCG_RELEASE}
fi
--
GitLab