diff --git a/external/flib_dpb/CMakeLists.txt b/external/flib_dpb/CMakeLists.txt
index 53adab25f1975f4d2965a849be1d2ee7db256d1c..a57ed65c46eab8b1f1a53fdd4ecfca418f7c9d9a 100644
--- a/external/flib_dpb/CMakeLists.txt
+++ b/external/flib_dpb/CMakeLists.txt
@@ -5,8 +5,9 @@ download_project_if_needed(PROJECT flib_dpb
TEST_FILE CMakeLists.txt
)
-Set(LIB_SOURCES flib_dpb/MicrosliceContents.cpp)
-Set(LIB_HEADERS flib_dpb/MicrosliceContents.hpp)
+set(LIB_SOURCES flib_dpb/MicrosliceContents.cpp)
+set(LIB_HEADERS flib_dpb/MicrosliceContents.hpp)
-Add_Library(flib_dpb SHARED ${LIB_SOURCES} ${LIB_HEADERS})
+add_Library(flib_dpb SHARED ${LIB_SOURCES} ${LIB_HEADERS})
+target_include_directories(flib_dpb PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/flib_dpb)
Set_Target_Properties(flib_dpb PROPERTIES SUFFIX ".so")
diff --git a/fles/cosy2019/CMakeLists.txt b/fles/cosy2019/CMakeLists.txt
index 8b929bdc8b6c1bcf82b8199b9a3b9799743db911..871fcde26daf474de5bc59649a3af0e9def88f90 100644
--- a/fles/cosy2019/CMakeLists.txt
+++ b/fles/cosy2019/CMakeLists.txt
@@ -2,51 +2,15 @@
# the array .
# The extension is already found. Any number of sources could be listed here.
-Set(INCLUDE_DIRECTORIES
+set(INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/parameter
${CMAKE_CURRENT_SOURCE_DIR}/unpacker
${CMAKE_CURRENT_SOURCE_DIR}/monitor
-
- ${CBMBASE_DIR}
-
- ${CBMDATA_DIR}
- ${CBMDATA_DIR}/base
- ${CBMDATA_DIR}/raw
- ${CBMDATA_DIR}/sts
-
- ${CBMROOT_SOURCE_DIR}/fles/flestools
-
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/unpacker
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/commonMQ
-
- ${CBMDETECTORBASE_DIR}/sts
)
-Set(SYSTEM_INCLUDE_DIRECTORIES
- ${BASE_INCLUDE_DIRECTORIES}
- ${Boost_INCLUDE_DIR}
- ${ROOT_INCLUDE_DIR}
- ${FLES_IPC_INCLUDE_DIRECTORY}
-)
-
-Include_Directories(${INCLUDE_DIRECTORIES})
-Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
-
-
-Set(LINK_DIRECTORIES
- ${ROOT_LIBRARY_DIR}
- ${FAIRROOT_LIBRARY_DIR}
- ${Boost_LIBRARY_DIRS}
-)
-
-Link_Directories(
- ${LINK_DIRECTORIES}
-)
-
-Set(SRCS
+set(SRCS
parameter/CbmCosy2019HodoPar.cxx
parameter/CbmCosy2019ContFact.cxx
@@ -58,12 +22,38 @@ Set(SRCS
monitor/CbmCosy2019MonitorTaskHodo.cxx
)
-Set(LINKDEF CbmBeamtimeCosy2019LinkDef.h )
-Set(LIBRARY_NAME CbmBeamtimeCosy2019)
-Set(DEPENDENCIES
- CbmFlibFlesTools CbmFlibMcbm2018
- CbmStsBase
- CbmData CbmBase external::fles_ipc Eve Base
-)
-GENERATE_LIBRARY()
+If(_UINT8_T_EXIST)
+ Add_Definitions(-DHAVE_UINT8_T_HEADER_FILE)
+ Set(DEFINITIONS HAVE_UINT8_T_HEADER_FILE)
+EndIf()
+
+
+set(LIBRARY_NAME CbmBeamtimeCosy2019)
+set(LINKDEF ${LIBRARY_NAME}LinkDef.h )
+set(PUBLIC_DEPENDENCIES
+ CbmData
+ CbmFlibMcbm2018
+ FairRoot::Base
+ FairRoot::ParBase
+ ROOT::Core
+ ROOT::Gpad
+ ROOT::Hist
+
+ )
+
+set(PRIVATE_DEPENDENCIES
+ CbmFlibFlesTools
+ CbmStsBase
+ FairLogger::FairLogger
+ ROOT::MathCore
+ ROOT::RHTTP
+ ROOT::RIO
+ )
+
+set(INTERFACE_DEPENDENCIES
+ external::fles_ipc
+ )
+
+
+generate_cbm_library()
diff --git a/fles/flestools/CMakeLists.txt b/fles/flestools/CMakeLists.txt
index a27cc3c92e5cbb8bc105008c09e1c7c0218baf41..6686e38adef89bd49406872408e7c2716e8aca8c 100644
--- a/fles/flestools/CMakeLists.txt
+++ b/fles/flestools/CMakeLists.txt
@@ -1,32 +1,11 @@
# Create a library called "libCbmFlibReader" which includes the source files given in
# the array .
# The extension is already found. Any number of sources could be listed here.
+set(INCLUDE_DIRECTORIES
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
-Set(INCLUDE_DIRECTORIES
-)
-
-Set(SYSTEM_INCLUDE_DIRECTORIES
- ${BASE_INCLUDE_DIRECTORIES}
- ${Boost_INCLUDE_DIR}
- ${ROOT_INCLUDE_DIR}
- ${FLES_IPC_INCLUDE_DIRECTORY}
-)
-
-Include_Directories(${INCLUDE_DIRECTORIES})
-Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
-
-
-Set(LINK_DIRECTORIES
- ${ROOT_LIBRARY_DIR}
- ${FAIRROOT_LIBRARY_DIR}
- ${Boost_LIBRARY_DIRS}
-)
-
-Link_Directories(
- ${LINK_DIRECTORIES}
-)
-
-Set(SRCS
+set(SRCS
CbmFormatDecHexPrintout.cxx
CbmFormatMsBufferPrintout.cxx
CbmFormatMsHeaderPrintout.cxx
@@ -35,10 +14,17 @@ Set(SRCS
CbmFlesHistosTools.cxx
)
-#Set(LINKDEF CbmFlibMcbm2018LinkDef.h )
-Set(LIBRARY_NAME CbmFlibFlesTools)
-Set(DEPENDENCIES
- external::fles_ipc Hist
-)
+If(_UINT8_T_EXIST)
+ Add_Definitions(-DHAVE_UINT8_T_HEADER_FILE)
+ Set(DEFINITIONS HAVE_UINT8_T_HEADER_FILE)
+EndIf()
+
+
+set(LIBRARY_NAME CbmFlibFlesTools)
+set(PRIVATE_DEPENDENCIES
+ ROOT::Gpad
+ ROOT::Hist
+ external::fles_ipc
+ )
-GENERATE_LIBRARY()
+generate_cbm_library()
diff --git a/fles/mcbm2018/CMakeLists.txt b/fles/mcbm2018/CMakeLists.txt
index cc731c84a39be273089f674dfd18fd83c8128026..23625e64f9d2588920cca47d17125f7c04654348 100644
--- a/fles/mcbm2018/CMakeLists.txt
+++ b/fles/mcbm2018/CMakeLists.txt
@@ -1,63 +1,17 @@
# Create a library called "libCbmFlibReader" which includes the source files given in
# the array .
# The extension is already found. Any number of sources could be listed here.
-
-Set(INCLUDE_DIRECTORIES
- ${CBMBASE_DIR}
-
- ${CBMDATA_DIR}
- ${CBMDATA_DIR}/base
- ${CBMDATA_DIR}/raw
- ${CBMDATA_DIR}/sts
- ${CBMDATA_DIR}/much
- ${CBMDATA_DIR}/global
- ${CBMDATA_DIR}/rich
- ${CBMDATA_DIR}/tof
- ${CBMDATA_DIR}/psd
- ${CBMDATA_DIR}/trd
-
- ${CBMROOT_SOURCE_DIR}/fles/flestools
-
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/dataforma
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/commonMQ
-# ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/parameter
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/unpacker
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/monitor
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/tasks
- ${CBMDETECTORBASE_DIR}/trd # required for parameter handling of the trd
- ${CBMDETECTORBASE_DIR}/psd
- ${CBMDETECTORBASE_DIR}/sts
- ${CBMDETECTORBASE_DIR}/tof
- ${CBMDETECTORBASE_DIR}/much
- ${CBMDETECTORBASE_DIR}/rich
-)
-
-Set(SYSTEM_INCLUDE_DIRECTORIES
- ${BASE_INCLUDE_DIRECTORIES}
- ${Boost_INCLUDE_DIR}
- ${ROOT_INCLUDE_DIR}
- ${FLES_IPC_INCLUDE_DIRECTORY}
- ${FLES_LOGGING_INCLUDE_DIRECTORY}
- ${CBMROOT_SOURCE_DIR}/external/flib_dpb/flib_dpb
- ${CMAKE_SOURCE_DIR}/external/cppzmq
-)
-
-Include_Directories(${INCLUDE_DIRECTORIES})
-Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
-
-
-Set(LINK_DIRECTORIES
- ${ROOT_LIBRARY_DIR}
- ${FAIRROOT_LIBRARY_DIR}
- ${Boost_LIBRARY_DIRS}
-)
-
-Link_Directories(
- ${LINK_DIRECTORIES}
-)
-
-Set(SRCS
+set(INCLUDE_DIRECTORIES
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/dataformat
+ ${CMAKE_CURRENT_SOURCE_DIR}/commonMQ
+ ${CMAKE_CURRENT_SOURCE_DIR}/unpacker
+ ${CMAKE_CURRENT_SOURCE_DIR}/tasks
+ ${CMAKE_CURRENT_SOURCE_DIR}/monitor
+ )
+
+set(SRCS
CbmMcbmUnpack.cxx
CbmMcbm2018Source.cxx
CbmMcbm2018MsCrcCheck.cxx
@@ -127,15 +81,49 @@ Set(SRCS
tasks/CbmMcbmSpillFindTask.cxx
)
-Set(LINKDEF CbmFlibMcbm2018LinkDef.h )
-Set(LIBRARY_NAME CbmFlibMcbm2018)
-Set(DEPENDENCIES
- CbmFlibFlesTools CbmStsBase CbmTofBase
- CbmRichBase CbmMuchBase CbmTrdBase CbmPsdBase
- CbmData CbmBase external::fles_ipc Eve Base
-)
-GENERATE_LIBRARY()
+If(_UINT8_T_EXIST)
+ Add_Definitions(-DHAVE_UINT8_T_HEADER_FILE)
+ Set(DEFINITIONS HAVE_UINT8_T_HEADER_FILE)
+EndIf()
+
+
+set(LIBRARY_NAME CbmFlibMcbm2018)
+set(LINKDEF ${LIBRARY_NAME}LinkDef.h )
+set(PUBLIC_DEPENDENCIES
+ CbmBase
+ CbmData
+ CbmTrdBase
+ CbmPsdBase
+ FairRoot::Base
+ external::fles_ipc
+ flib_dpb
+ ROOT::Core
+ ROOT::Hist
+ )
+
+set(PRIVATE_DEPENDENCIES
+ CbmFlibFlesTools
+ CbmMuchBase
+ CbmRichBase
+ CbmStsBase
+ CbmTofBase
+ FairLogger::FairLogger
+ FairRoot::ParBase
+ cppzmq
+ external::fles_logging
+ ROOT::Gpad
+ ROOT::Graf
+ ROOT::MathCore
+ ROOT::Physics
+ ROOT::RHTTP
+ ROOT::RIO
+ )
+
+generate_cbm_library()
# Install file which has no corresponding source file
-install(FILES commonMQ/CbmStar2019Algo.h DESTINATION include)
+install(FILES commonMQ/CbmStar2019Algo.h
+ DESTINATION include
+ )
+
diff --git a/fles/star2019/CMakeLists.txt b/fles/star2019/CMakeLists.txt
index 8c684dad821089eb48d6d73b091dc4a4be212b9b..1a20a9bcc74b168bea00bc419486d69bd1f8a078 100644
--- a/fles/star2019/CMakeLists.txt
+++ b/fles/star2019/CMakeLists.txt
@@ -2,57 +2,16 @@
# the array .
# The extension is already found. Any number of sources could be listed here.
-Set(INCLUDE_DIRECTORIES
- ${CBMBASE_DIR}
-
- ${CBMDATA_DIR}
- ${CBMDATA_DIR}/raw
- ${CBMDATA_DIR}/tof
- ${CBMDATA_DIR}/tof/etof # For the star_rhicf.c interface file and the final data format classes
-
-
- ${CBMROOT_SOURCE_DIR}/fles/flestools
-
-# ${CBMROOT_SOURCE_DIR}/fles/star2017/unpacker # For the star_rhicf.c interface file
-
-# ${CBMROOT_SOURCE_DIR}/fles/star2018/unpacker # for the STAR2018 Event and Trigger format
-
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/dataformat
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/commonMQ
-
- ${CBMROOT_SOURCE_DIR}/fles/star2019/
- ${CBMROOT_SOURCE_DIR}/fles/star2019/parameter
- ${CBMROOT_SOURCE_DIR}/fles/star2019/commonMQ
+set(INCLUDE_DIRECTORIES
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/parameter
+ # ${CMAKE_CURRENT_SOURCE_DIR}/commonMQ
# ${CBMROOT_SOURCE_DIR}/fles/star2019/unpacker
- ${CBMROOT_SOURCE_DIR}/fles/star2019/monitor
- ${CBMROOT_SOURCE_DIR}/fles/star2019/eventbuilder
-)
-
-Set(SYSTEM_INCLUDE_DIRECTORIES
- ${BASE_INCLUDE_DIRECTORIES}
- ${Boost_INCLUDE_DIR}
- ${ROOT_INCLUDE_DIR}
- ${FLES_IPC_INCLUDE_DIRECTORY}
- ${CBMROOT_SOURCE_DIR}/external/flib_dpb/flib_dpb
- ${CMAKE_SOURCE_DIR}/external/cppzmq
-)
-
-Include_Directories(${INCLUDE_DIRECTORIES})
-Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
-
-
-Set(LINK_DIRECTORIES
- ${ROOT_LIBRARY_DIR}
- ${FAIRROOT_LIBRARY_DIR}
- ${Boost_LIBRARY_DIRS}
-)
-
-Link_Directories(
- ${LINK_DIRECTORIES}
+ ${CMAKE_CURRENT_SOURCE_DIR}/monitor
+ ${CMAKE_CURRENT_SOURCE_DIR}/eventbuilder
)
-Set(SRCS
+set(SRCS
parameter/CbmStar2019TofPar.cxx
parameter/CbmStar2019ContFact.cxx
@@ -66,10 +25,35 @@ Set(SRCS
eventbuilder/CbmStar2019EventBuilderEtof.cxx
)
-Set(LINKDEF CbmFlibStar2019LinkDef.h )
-Set(LIBRARY_NAME CbmFlibStar2019)
-Set(DEPENDENCIES
- CbmFlibMcbm2018 CbmData CbmBase external::fles_ipc Eve Base
-)
+If(_UINT8_T_EXIST)
+ Add_Definitions(-DHAVE_UINT8_T_HEADER_FILE)
+ Set(DEFINITIONS HAVE_UINT8_T_HEADER_FILE)
+EndIf()
+
+set(LIBRARY_NAME CbmFlibStar2019)
+set(LINKDEF ${LIBRARY_NAME}LinkDef.h )
+set(PUBLIC_DEPENDENCIES
+ CbmData
+ FairRoot::ParBase
+ ROOT::Core
+ )
+
+set(PRIVATE_DEPENDENCIES
+ CbmBase
+ CbmFlibFlesTools
+ CbmFlibMcbm2018
+ FairRoot::Base
+ ROOT::Gpad
+ ROOT::Graf
+ ROOT::Hist
+ ROOT::MathCore
+ ROOT::RHTTP
+ ROOT::RIO
+ )
+
+set(INTERFACE_DEPENDENCIES
+ external::fles_ipc
+ )
+
+generate_cbm_library()
-GENERATE_LIBRARY()