From 19d9d6fde11b5ccf63ea65335cb373325990ae7d Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Wed, 11 May 2022 16:33:37 +0200
Subject: [PATCH] Adapt build system to new flesnet

---
 MQ/eTOF/CMakeLists.txt             | 1 -
 MQ/histoServer/CMakeLists.txt      | 1 +
 MQ/mcbm/CMakeLists.txt             | 2 --
 MQ/source/CMakeLists.txt           | 2 ++
 fles/mcbm2018/CMakeLists.txt       | 1 +
 reco/detectors/much/CMakeLists.txt | 2 +-
 reco/mq/CMakeLists.txt             | 2 +-
 7 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/MQ/eTOF/CMakeLists.txt b/MQ/eTOF/CMakeLists.txt
index ccfdd8aa16..0aba71194d 100644
--- a/MQ/eTOF/CMakeLists.txt
+++ b/MQ/eTOF/CMakeLists.txt
@@ -100,7 +100,6 @@ Set(NO_DICT_SRCS
 SET_SOURCE_FILES_PROPERTIES(${CBMROOT_SOURCE_DIR}/fles/star2017/unpacker/star_rhicf.c PROPERTIES COMPILE_FLAGS -Wno-pointer-sign)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
   external::fles_ipc
   CbmFlibStar2019
   CbmFlibMcbm2018
diff --git a/MQ/histoServer/CMakeLists.txt b/MQ/histoServer/CMakeLists.txt
index 70ef6e3693..8cc626787e 100644
--- a/MQ/histoServer/CMakeLists.txt
+++ b/MQ/histoServer/CMakeLists.txt
@@ -45,6 +45,7 @@ EndIf()
 
 Set(BOOST_LIBS
   ${Boost_SYSTEM_LIBRARY}
+  ${Boost_SERIALIZATION_LIBRARY}
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
 )
 If(UNIX AND NOT APPLE)
diff --git a/MQ/mcbm/CMakeLists.txt b/MQ/mcbm/CMakeLists.txt
index dc55f355d0..0c6680cd22 100644
--- a/MQ/mcbm/CMakeLists.txt
+++ b/MQ/mcbm/CMakeLists.txt
@@ -115,7 +115,6 @@ set(SRCS CbmDeviceMcbmUnpack.cxx runMcbmUnpack.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
   external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -134,7 +133,6 @@ set(SRCS CbmDeviceMcbmMonitorPulser.cxx runMcbmMonitorPulser.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
   external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
diff --git a/MQ/source/CMakeLists.txt b/MQ/source/CMakeLists.txt
index 0f2055463f..f25d984625 100644
--- a/MQ/source/CMakeLists.txt
+++ b/MQ/source/CMakeLists.txt
@@ -28,6 +28,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
     ${FAIRLOGGER_INCLUDE_DIR}
 
     ${FLES_IPC_INCLUDE_DIRECTORY}
+    ${FLES_LOGGING_INCLUDE_DIRECTORY}
     ${CBMROOT_SOURCE_DIR}/external/cppzmq
 )
 
@@ -53,6 +54,7 @@ Set(BOOST_LIBS
   ${Boost_SERIALIZATION_LIBRARY}
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
   ${Boost_LOG_LIBRARY}
+  ${Boost_THREAD_LIBRARY}
   ${Boost_REGEX_LIBRARY}
 )
 
diff --git a/fles/mcbm2018/CMakeLists.txt b/fles/mcbm2018/CMakeLists.txt
index fa251c2284..5ec2c19dab 100644
--- a/fles/mcbm2018/CMakeLists.txt
+++ b/fles/mcbm2018/CMakeLists.txt
@@ -38,6 +38,7 @@ Set(SYSTEM_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
 )
diff --git a/reco/detectors/much/CMakeLists.txt b/reco/detectors/much/CMakeLists.txt
index 5da896630c..fbc1ebb738 100644
--- a/reco/detectors/much/CMakeLists.txt
+++ b/reco/detectors/much/CMakeLists.txt
@@ -21,7 +21,7 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
 
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
-  ${IPC_INCLUDE_DIRECTORY} # for fles for unpacker
+  ${FLES_IPC_INCLUDE_DIRECTORY}
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
diff --git a/reco/mq/CMakeLists.txt b/reco/mq/CMakeLists.txt
index 1fe076d491..8334c0263b 100644
--- a/reco/mq/CMakeLists.txt
+++ b/reco/mq/CMakeLists.txt
@@ -87,7 +87,7 @@ set(DEPENDENCIES
   ${DEPENDENCIES}
   ${FAIR_LIBS}
   ${BOOST_LIBS}
-  fles_ipc
+  external::fles_ipc
   CbmFlibFlesTools
   Algo
   CbmBase
-- 
GitLab