From 90f69fafb6895bec58ebdda664e89f0dfd4e4ed3 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Fri, 3 Dec 2021 17:37:02 +0100
Subject: [PATCH] Adapt build system according to changes of KF
Add missing library dependencies and link directories.
Remove obsolete library dependencies and include/link directories.
---
.../common/analysis_tree_converter/CMakeLists.txt | 5 +----
reco/L1/CMakeLists.txt | 4 ++++
reco/detectors/rich/CMakeLists.txt | 2 +-
reco/eventbuilder/CMakeLists.txt | 13 ++-----------
reco/littrack/CMakeLists.txt | 5 +++--
reco/steer/CMakeLists.txt | 3 ++-
reco/tracking/BinnedTracker/CMakeLists.txt | 2 +-
reco/tracking/global/CMakeLists.txt | 2 +-
reco/tracking/lx/CMakeLists.txt | 3 ++-
9 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/analysis/common/analysis_tree_converter/CMakeLists.txt b/analysis/common/analysis_tree_converter/CMakeLists.txt
index 8783ee8728..de5f664286 100644
--- a/analysis/common/analysis_tree_converter/CMakeLists.txt
+++ b/analysis/common/analysis_tree_converter/CMakeLists.txt
@@ -32,11 +32,8 @@ Set(INCLUDE_DIRECTORIES
${CBMROOT_SOURCE_DIR}/sim/transport/geosetup
${CBMROOT_SOURCE_DIR}/reco/KF
- ${CBMROOT_SOURCE_DIR}/reco/KF/Interface
- ${CBMROOT_SOURCE_DIR}/reco/KF/KFQA
${CBMROOT_SOURCE_DIR}/reco/L1
${CBMROOT_SOURCE_DIR}/reco/L1/L1Algo
- ${CBMROOT_SOURCE_DIR}/reco/L1/ParticleFinder
${KFParticle_INCLUDE_DIR}
${AnalysisTree_INCLUDE_DIR}
${CBMROOT_SOURCE_DIR}/sim/transport/generators/unigen
@@ -78,7 +75,7 @@ Set(DEPENDENCIES
${_AnalysisTree_LIB}
CbmData
CbmBase
- KF
+ KFParticleInterface
L1
CbmSimGenerators
)
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index 5c76eaf2a1..ee75547634 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -64,6 +64,7 @@ ${CBMROOT_SOURCE_DIR}/mvd
Include_Directories( ${INCLUDE_DIRECTORIES})
Set(SYSTEM_INCLUDE_DIRECTORIES
+ ${VC_INCLUDE_DIRS}
${BASE_INCLUDE_DIRECTORIES}
${KFParticle_INCLUDE_DIR}
)
@@ -80,6 +81,7 @@ endif()
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
+${Vc_LIB_DIR}
${KFParticle_LIB_DIR}
${FAIRROOT_LIBRARY_DIR}
${ROOT_LIBRARY_DIR}
@@ -226,6 +228,7 @@ Set(LIBRARY_NAME L1)
Set(DEPENDENCIES
KF
+ KFParticle
Base
CbmBase
CbmData
@@ -233,6 +236,7 @@ Set(DEPENDENCIES
# CbmGeoSetup
CbmMuchBase
CbmTrdBase
+ CbmTofBase
CbmStsBase
CbmRecoBase
CbmRecoSts
diff --git a/reco/detectors/rich/CMakeLists.txt b/reco/detectors/rich/CMakeLists.txt
index 3697ecedfe..7c67adfe53 100644
--- a/reco/detectors/rich/CMakeLists.txt
+++ b/reco/detectors/rich/CMakeLists.txt
@@ -127,7 +127,7 @@ set(LINKDEF CbmRichRecoLinkDef.h)
Set(LIBRARY_NAME CbmRichReco)
Set(DEPENDENCIES
- KF L1 Littrack CbmRichBase CbmRecoBase CbmBase CbmData Base MLP boost_regex Gdml
+ KF KFParticleInterface L1 Littrack CbmRichBase CbmRecoBase CbmBase CbmData Base MLP boost_regex Gdml
)
GENERATE_LIBRARY()
diff --git a/reco/eventbuilder/CMakeLists.txt b/reco/eventbuilder/CMakeLists.txt
index 1ad77dc8cf..6e49500b79 100644
--- a/reco/eventbuilder/CMakeLists.txt
+++ b/reco/eventbuilder/CMakeLists.txt
@@ -24,18 +24,9 @@ ${CBMDATA_DIR}/global
${CBMROOT_SOURCE_DIR}/reco/L1
${CBMROOT_SOURCE_DIR}/reco/L1/L1Algo
-${CBMROOT_SOURCE_DIR}/reco/L1/OffLineInterface
-${CBMROOT_SOURCE_DIR}/reco/L1/ParticleFinder
-
-${CBMROOT_SOURCE_DIR}/reco/KF
-${CBMROOT_SOURCE_DIR}/reco/KF/KFQA
-${CBMROOT_SOURCE_DIR}/reco/KF/Interface
-${CBMDATA_DIR}
${CBMROOT_SOURCE_DIR}/mvd
- ${CBMDETECTORBASE_DIR}/sts
-#${CBMROOT_SOURCE_DIR}/sts/setup
-#${CBMROOT_SOURCE_DIR}/sts
+${CBMDETECTORBASE_DIR}/sts
${CBMROOT_SOURCE_DIR}/rich
${CBMROOT_SOURCE_DIR}/tof/TofMC
@@ -97,7 +88,7 @@ ENDIF (SSE_FOUND)
set(LINKDEF CbmEventBuilderLinkDef.h)
Set(LIBRARY_NAME CbmEventBuilder)
Set(DEPENDENCIES
- CbmData CbmBase CbmField CbmStsBase CbmMvd Base KF CbmQaBase
+ CbmData CbmBase CbmField CbmStsBase CbmMvd Base CbmQaBase
)
GENERATE_LIBRARY()
diff --git a/reco/littrack/CMakeLists.txt b/reco/littrack/CMakeLists.txt
index 5b2a090a58..15cd7a0194 100644
--- a/reco/littrack/CMakeLists.txt
+++ b/reco/littrack/CMakeLists.txt
@@ -181,7 +181,8 @@ EndIf (Boost_FOUND)
set(LINKDEF LittrackLinkDef.h)
Set(LIBRARY_NAME Littrack)
Set(DEPENDENCIES
- Littrackparallel KF CbmMuchBase CbmStsBase CbmRichBase CbmRecoBase CbmBase CbmData Base
+ Littrackparallel KF KFParticleInterface L1 CbmMuchBase CbmStsBase CbmRichBase CbmRecoBase CbmBase CbmData
+ CbmTofBase Base
)
GENERATE_LIBRARY()
@@ -191,7 +192,7 @@ set(HEADERS ${QA_HEADERS})
set(LINKDEF LittrackQALinkDef.h)
Set(LIBRARY_NAME LittrackQA)
Set(DEPENDENCIES
- Littrack
+ Littrack CbmRichReco KFParticleInterface
)
GENERATE_LIBRARY()
diff --git a/reco/steer/CMakeLists.txt b/reco/steer/CMakeLists.txt
index e5f21ecf09..e020938e05 100644
--- a/reco/steer/CMakeLists.txt
+++ b/reco/steer/CMakeLists.txt
@@ -80,10 +80,11 @@ CbmPsdBase
CbmPsdReco
CbmRichReco
CbmRecoSts
-# CbmTofReco
+CbmTofBase
CbmTrdReco
CbmData
KF
+KFParticleInterface
)
# ---------------------------------------------------------
diff --git a/reco/tracking/BinnedTracker/CMakeLists.txt b/reco/tracking/BinnedTracker/CMakeLists.txt
index 5588b4f24e..538986f365 100644
--- a/reco/tracking/BinnedTracker/CMakeLists.txt
+++ b/reco/tracking/BinnedTracker/CMakeLists.txt
@@ -60,7 +60,7 @@ Set(NO_DICT_SRCS
set(LINKDEF CbmBinnedTrackerLinkDef.h)
Set(LIBRARY_NAME CbmBinnedTracker)
Set(DEPENDENCIES
- CbmBase CbmData CbmMuchBase CbmStsBase Base
+ CbmBase CbmData CbmMuchBase CbmStsBase Base CbmSimSteer
)
GENERATE_LIBRARY()
diff --git a/reco/tracking/global/CMakeLists.txt b/reco/tracking/global/CMakeLists.txt
index ae6c029fc2..dd78249e04 100755
--- a/reco/tracking/global/CMakeLists.txt
+++ b/reco/tracking/global/CMakeLists.txt
@@ -57,7 +57,7 @@ Set(NO_DICT_SRCS
set(LINKDEF GlobalLinkDef.h)
Set(LIBRARY_NAME CbmGlobalTracking)
Set(DEPENDENCIES
- CbmBase CbmData Base CbmMuchBase KF
+ CbmBase CbmData Base CbmMuchBase KF Littrack KFParticleInterface
# CbmLitTrack CbmKF CbmRun ????
)
diff --git a/reco/tracking/lx/CMakeLists.txt b/reco/tracking/lx/CMakeLists.txt
index 9433c9fa75..1462cbf322 100755
--- a/reco/tracking/lx/CMakeLists.txt
+++ b/reco/tracking/lx/CMakeLists.txt
@@ -43,6 +43,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
Set(LINK_DIRECTORIES
+ ${KFParticle_LIB_DIR}
${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}
${Boost_LIBRARY_DIRS}
@@ -67,7 +68,7 @@ Set(NO_DICT_SRCS
set(LINKDEF LxLinkDef.h)
Set(LIBRARY_NAME LxTrack)
Set(DEPENDENCIES
- CbmBase CbmData Base CbmMuchBase
+ CbmBase CbmData Base CbmMuchBase Littrack
# CbmMuchSim CbmKF CbmLitTrack CbmSrt ????
)
--
GitLab