Commit 90f69faf authored by Administrator's avatar Administrator Committed by Florian Uhlig
Browse files

Adapt build system according to changes of KF

Add missing library dependencies and link directories.
Remove obsolete library dependencies and include/link directories.
parent dcb3df45
......@@ -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
)
......
......@@ -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
......
......@@ -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()
......
......@@ -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()
......@@ -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()
......
......@@ -80,10 +80,11 @@ CbmPsdBase
CbmPsdReco
CbmRichReco
CbmRecoSts
# CbmTofReco
CbmTofBase
CbmTrdReco
CbmData
KF
KFParticleInterface
)
# ---------------------------------------------------------
......
......@@ -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()
......
......@@ -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 ????
)
......
......@@ -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 ????
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment