Skip to content
Snippets Groups Projects
Commit 1bdd5b21 authored by Sergei Zharko's avatar Sergei Zharko
Browse files

moving CMake code for the OnlineData library to the core/data directory

parent f288dbed
No related branches found
No related tags found
1 merge request!2085CbmContainers/OnlineContainers library
Pipeline #34515 passed
Stage: checkRepository
Stage: checkFormat
Stage: build
Stage: package
Stage: verify
Stage: finalise
Show whitespace changes
Inline Side-by-side
algo/CMakeLists.txt
+ 1
− 2
View file @ 1bdd5b21
......@@ -50,13 +50,12 @@ if (CBM_ONLINE_STANDALONE)
include(CbmMacros) # for 'download_project_if_needed', 'Gen_Exe_Script' macro
add_subdirectory(../external external)
add_subdirectory(../core/containers containers)
add_subdirectory(../core core)
endif()
add_subdirectory(base)
add_subdirectory(log)
add_subdirectory(ca)
add_subdirectory(online)
add_subdirectory(kf)
add_subdirectory(kfp)
......
algo/online/CMakeLists.txt deleted 100644 → 0
+ 0
− 5
View file @ f288dbed
# A rule to build the online versions of CbmRoot core libraries
#
add_subdirectory(data)
algo/online/data/CMakeLists.txt deleted 100644 → 0
+ 0
− 66
View file @ f288dbed
# Create a library called "libCbmOnlineData" which includes the source files given in
# the array .
# The extension is already found. Any number of sources could be listed here.
set(OFFLINE_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../core/data)
set(SRCS
${OFFLINE_DATA_DIR}/CbmDefs.cxx
${OFFLINE_DATA_DIR}/CbmAddress.cxx
${OFFLINE_DATA_DIR}/bmon/CbmBmonDigi.cxx
${OFFLINE_DATA_DIR}/sts/CbmStsAddress.cxx
${OFFLINE_DATA_DIR}/sts/CbmStsDigi.cxx
${OFFLINE_DATA_DIR}/rich/CbmRichDigi.cxx
${OFFLINE_DATA_DIR}/much/CbmMuchDigi.cxx
${OFFLINE_DATA_DIR}/much/CbmMuchAddress.cxx
${OFFLINE_DATA_DIR}/trd/CbmTrdDigi.cxx
${OFFLINE_DATA_DIR}/trd/CbmTrdRawMessageSpadic.cxx
${OFFLINE_DATA_DIR}/tof/CbmTofDigi.cxx
${OFFLINE_DATA_DIR}/tof/CbmTofAddress.cxx
${OFFLINE_DATA_DIR}/tof/CbmTofDetectorId.cxx
${OFFLINE_DATA_DIR}/tof/CbmTofDetectorId_v12b.cxx
${OFFLINE_DATA_DIR}/psd/CbmPsdDigi.cxx
${OFFLINE_DATA_DIR}/psd/CbmPsdAddress.cxx
${OFFLINE_DATA_DIR}/fsd/CbmFsdDigi.cxx
${OFFLINE_DATA_DIR}/fsd/CbmFsdAddress.cxx
${OFFLINE_DATA_DIR}/raw/CriGet4Mess001.cxx
${OFFLINE_DATA_DIR}/raw/StsXyterMessage.cxx
)
add_library(OnlineData SHARED ${SRCS})
target_include_directories(OnlineData
PUBLIC ${OFFLINE_DATA_DIR}
PUBLIC ${OFFLINE_DATA_DIR}/base
PUBLIC ${OFFLINE_DATA_DIR}/bmon
PUBLIC ${OFFLINE_DATA_DIR}/sts
PUBLIC ${OFFLINE_DATA_DIR}/rich
PUBLIC ${OFFLINE_DATA_DIR}/much
PUBLIC ${OFFLINE_DATA_DIR}/trd
PUBLIC ${OFFLINE_DATA_DIR}/tof
PUBLIC ${OFFLINE_DATA_DIR}/psd
PUBLIC ${OFFLINE_DATA_DIR}/fsd
PUBLIC ${OFFLINE_DATA_DIR}/global
PUBLIC ${OFFLINE_DATA_DIR}/raw
)
target_compile_definitions(OnlineData PUBLIC NO_ROOT)
target_link_libraries(OnlineData
OnlineDataLog
external::fles_ipc
xpu
Boost::serialization
external::fles_logging
)
install(TARGETS OnlineData DESTINATION lib)
core/CMakeLists.txt
+ 32
− 27
View file @ 1bdd5b21
......@@ -2,8 +2,12 @@
set(CBMDATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data)
set(CBMBASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/base)
# CbmRoot core both for online/offline installation
add_subdirectory(containers)
add_subdirectory(data)
# CbmRoot core for offline installation only
if(NOT DEFINED CBM_ONLINE_STANDALONE)
add_subdirectory(field)
add_subdirectory(base)
add_subdirectory(qa)
......@@ -36,3 +40,4 @@ EndIf()
Install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config/CbmConfigBase.h
DESTINATION include
)
endif()
core/data/CMakeLists.txt
+ 178
− 133
View file @ 1bdd5b21
......@@ -2,11 +2,10 @@
# the array .
# The extension is already found. Any number of sources could be listed here.
set(INCLUDE_DIRECTORIES
set(INCLUDE_DIRECTORIES_COMMON # Common include directories for CbmData and OnlineData
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/base
${CMAKE_CURRENT_SOURCE_DIR}/raw
${CMAKE_CURRENT_SOURCE_DIR}/mvd
${CMAKE_CURRENT_SOURCE_DIR}/bmon
${CMAKE_CURRENT_SOURCE_DIR}/sts
${CMAKE_CURRENT_SOURCE_DIR}/much
......@@ -18,9 +17,55 @@ set(INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}/global
)
set(INCLUDE_DIRECTORIES_ONLINE # Include directories for OnlineData
${INCLUDE_DIRECTORIES_COMMON}
)
set(SRCS
set(SRCS_COMMON # Common sources for CbmData and OnlineData
CbmAddress.cxx
bmon/CbmBmonDigi.cxx
sts/CbmStsAddress.cxx
sts/CbmStsDigi.cxx
rich/CbmRichDigi.cxx
much/CbmMuchDigi.cxx
much/CbmMuchAddress.cxx
trd/CbmTrdDigi.cxx
trd/CbmTrdRawMessageSpadic.cxx
tof/CbmTofDigi.cxx
tof/CbmTofAddress.cxx
tof/CbmTofDetectorId.cxx
tof/CbmTofDetectorId_v12b.cxx
psd/CbmPsdDigi.cxx
psd/CbmPsdAddress.cxx
fsd/CbmFsdDigi.cxx
fsd/CbmFsdAddress.cxx
raw/CriGet4Mess001.cxx
raw/StsXyterMessage.cxx
)
set(SRCS_ONLINE # Sources for OnlineData
CbmDefs.cxx
${SRCS_COMMON}
)
#### CbmData library installation rule
if (NOT CBM_ONLINE_STANDALONE)
set(INCLUDE_DIRECTORIES # Include directories for CbmData
${INCLUDE_DIRECTORIES_COMMON}
${CMAKE_CURRENT_SOURCE_DIR}/mvd
)
set(SRCS # Sources for CbmData
${SRCS_COMMON}
CbmTimeSlice.cxx
CbmEvent.cxx
CbmEventTriggers.cxx
......@@ -51,11 +96,8 @@ set(SRCS
mvd/CbmMvdPoint.cxx
mvd/CbmMvdHitMatch.cxx
bmon/CbmBmonDigi.cxx
sts/CbmStsAddress.cxx
sts/CbmStsCluster.cxx
sts/CbmStsDigi.cxx
sts/CbmStsHit.cxx
sts/CbmStsPoint.cxx
sts/CbmStsTrack.cxx
......@@ -64,58 +106,45 @@ set(SRCS
rich/CbmRichHit.cxx
rich/CbmRichPoint.cxx
rich/CbmRichTrbDigi.cxx
rich/CbmRichDigi.cxx
much/CbmMuchPixelHit.cxx
much/CbmMuchPoint.cxx
much/CbmMuchCluster.cxx
much/CbmMuchDigi.cxx
much/CbmMuchBeamTimeDigi.cxx
much/CbmMuchDigiMatch.cxx
much/CbmMuchTrack.cxx
much/CbmMuchAddress.cxx
trd/CbmTrdHit.cxx
trd/CbmTrdTrack.cxx
trd/CbmTrdPoint.cxx
trd/CbmTrdDigi.cxx
trd/CbmTrdAddress.cxx
trd/CbmTrdCluster.cxx
trd/CbmTrdRawMessageSpadic.cxx
tof/CbmTofHit.cxx
tof/CbmTofPoint.cxx
tof/CbmTofDetectorId.cxx
tof/CbmTofDetectorId_v07a.cxx
tof/CbmTofDetectorId_v12b.cxx
tof/CbmTofDetectorId_v14a.cxx
tof/CbmTofDetectorId_v21a.cxx
tof/CbmTofAddress.cxx
tof/CbmTofDigi.cxx
tof/CbmTofTrack.cxx
tof/CbmTofTracklet.cxx
tof/CbmTofTrackletParam.cxx
psd/CbmPsdDigi.cxx
psd/CbmPsdDsp.cxx
psd/CbmPsdHit.cxx
psd/CbmPsdPoint.cxx
psd/CbmPsdAddress.cxx
psd/CbmPsdMCbmHit.cxx
fsd/CbmFsdDigi.cxx
fsd/CbmFsdHit.cxx
fsd/CbmFsdPoint.cxx
fsd/CbmFsdAddress.cxx
global/CbmGlobalTrack.cxx
global/CbmVertex.cxx
global/CbmTrackParam.cxx
raw/AccDataSis18.cxx
raw/StsXyterMessage.cxx
raw/gDpbMessv100.cxx
raw/CriGet4Mess001.cxx
raw/TimesliceMetaData.cxx
raw/PsdGbtReader-v0.00.cxx
raw/PsdGbtReader-v1.00.cxx
......@@ -173,3 +202,19 @@ Install(FILES
raw/bitmask_operators.hpp raw/StsXyterFinalHit.h raw/PsdGbtDataFormat-v0.00.h raw/PsdGbtDataFormat-v1.00.h
DESTINATION include
)
endif() # not CBM_ONLINE_STANDALONE
#### OnlineData library installation rule
add_library(OnlineData SHARED ${SRCS_ONLINE})
target_include_directories(OnlineData PUBLIC ${INCLUDE_DIRECTORIES_ONLINE})
target_compile_definitions(OnlineData PUBLIC NO_ROOT)
target_link_libraries(OnlineData
OnlineDataLog
external::fles_ipc
xpu
Boost::serialization
external::fles_logging
)
install(TARGETS OnlineData DESTINATION lib)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment