From 3873f938a0c52d509c96eb0f74279e8f7066e59e Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Tue, 13 Oct 2020 00:05:50 +0800
Subject: [PATCH] WIP: the FindCLHEP from Gaudi is used when using spack. Just
remove the explict dependencies on CLHEP.
---
Digitisers/SimpleDigi/CMakeLists.txt | 1 -
Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt | 1 -
Service/TrackSystemSvc/CMakeLists.txt | 1 -
Utilities/KalDet/CMakeLists.txt | 1 -
Utilities/KiTrack/CMakeLists.txt | 1 -
build-k4.sh | 1 -
6 files changed, 6 deletions(-)
diff --git a/Digitisers/SimpleDigi/CMakeLists.txt b/Digitisers/SimpleDigi/CMakeLists.txt
index 5487682d..ddb0663d 100644
--- a/Digitisers/SimpleDigi/CMakeLists.txt
+++ b/Digitisers/SimpleDigi/CMakeLists.txt
@@ -1,6 +1,5 @@
gaudi_subdir(SimpleDigi v0r0)
-find_package(CLHEP REQUIRED)
find_package(GEAR REQUIRED)
find_package(GSL REQUIRED )
find_package(LCIO REQUIRED )
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
index 0f8625a6..48415cc5 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
@@ -1,6 +1,5 @@
gaudi_subdir(GaudiPandora v0r0)
-find_package(CLHEP REQUIRED)
find_package(LCIO REQUIRED )
find_package(GEAR REQUIRED)
message("ENV GEAR: $ENV{GEAR}")
diff --git a/Service/TrackSystemSvc/CMakeLists.txt b/Service/TrackSystemSvc/CMakeLists.txt
index 349b3b6b..7e68d761 100644
--- a/Service/TrackSystemSvc/CMakeLists.txt
+++ b/Service/TrackSystemSvc/CMakeLists.txt
@@ -1,7 +1,6 @@
gaudi_subdir(TrackSystemSvc v0r0)
find_package(ROOT 6.14 REQUIRED COMPONENTS Matrix Physics)
-find_package(CLHEP REQUIRED)
find_package(GEAR REQUIRED)
find_package(LCIO REQUIRED)
find_package(EDM4HEP REQUIRED)
diff --git a/Utilities/KalDet/CMakeLists.txt b/Utilities/KalDet/CMakeLists.txt
index 147328d0..d71f37dd 100644
--- a/Utilities/KalDet/CMakeLists.txt
+++ b/Utilities/KalDet/CMakeLists.txt
@@ -5,7 +5,6 @@
gaudi_subdir(KalDet v0r0)
-find_package(CLHEP REQUIRED)
find_package(LCIO)
find_package(GEAR)
find_package(ROOT COMPONENTS MathCore)
diff --git a/Utilities/KiTrack/CMakeLists.txt b/Utilities/KiTrack/CMakeLists.txt
index ba301e6f..6ebfefe2 100644
--- a/Utilities/KiTrack/CMakeLists.txt
+++ b/Utilities/KiTrack/CMakeLists.txt
@@ -1,7 +1,6 @@
gaudi_subdir(KiTrack v0r0)
find_package(ROOT REQUIRED)
-find_package(CLHEP REQUIRED)
#find_package(DD4hep REQUIRED)
find_package(GSL REQUIRED)
find_package(EDM4HEP REQUIRED)
diff --git a/build-k4.sh b/build-k4.sh
index 27c6f357..80ffe55a 100755
--- a/build-k4.sh
+++ b/build-k4.sh
@@ -78,7 +78,6 @@ function run-cmake() {
local cmake_modules=${pandorapfa_cmake_modules}
cmake .. -DHOST_BINARY_TAG=${k4_platform} \
- -DCLHEP_INCLUDE_DIR=${clhep_include} \
-DCMAKE_MODULE_PATH=${cmake_modules} || {
error: "Failed to cmake"
return 1
--
GitLab