From c05a48e6ce1936f105a428d7fbd57fe0269b53ae Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Fri, 11 Oct 2024 12:00:18 +0200
Subject: [PATCH] Logger Bugfix: Fix wrong lib dependency in // littrack +
 resulting missing dependencies

---
 algo/log/AlgoFairloggerCompat.h       |  4 ++--
 reco/littrack/parallel/CMakeLists.txt |  7 ++++---
 reco/mq/CMakeLists.txt                | 18 +++++++++---------
 reco/offline/steer/CMakeLists.txt     |  2 +-
 reco/steer/CMakeLists.txt             |  1 +
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/algo/log/AlgoFairloggerCompat.h b/algo/log/AlgoFairloggerCompat.h
index 4dfdddd3d6..9062034a8b 100644
--- a/algo/log/AlgoFairloggerCompat.h
+++ b/algo/log/AlgoFairloggerCompat.h
@@ -18,8 +18,6 @@
 #define L_(level) LOG(level)
 
 #else
-
-#ifndef LOG
 /*
  *  // Keeping in source but commented out until the main problem is resolved
 #warning "Using algo/???? version of Logger"
@@ -38,6 +36,8 @@
 #endif
 */
 
+#ifndef LOG
+
 #include <log.hpp>
 static constexpr severity_level warn = severity_level::warning;
 #define LOG(level) L_(level)
diff --git a/reco/littrack/parallel/CMakeLists.txt b/reco/littrack/parallel/CMakeLists.txt
index bb33d371fb..759ac36321 100644
--- a/reco/littrack/parallel/CMakeLists.txt
+++ b/reco/littrack/parallel/CMakeLists.txt
@@ -24,10 +24,11 @@ ENDIF (SSE_FOUND)
 
 
 set(SRCS ${LITTRACKPARALLEL_SRCS})
-# Since there was a problem with defining Vc::Vc as a dependecy a dependency
-# to KFParticle was set which includes the Vc dependency
+# PAL 11/10/2024: Is the following comment still valid? There seem to be a direct dependency now ?!?!?
+# Since there was a problem with defining Vc::Vc as a dependency, a dependency to KFParticle was set which includes the
+# Vc dependency
 # This has to be fixed and done properly
-set(PUBLIC_DEPENDENCIES Vc::Vc KfCore)
+set(PUBLIC_DEPENDENCIES Vc::Vc KfCoreOffline)
 set(LIBRARY_NAME Littrackparallel)
 
 generate_cbm_library()
diff --git a/reco/mq/CMakeLists.txt b/reco/mq/CMakeLists.txt
index 672ea8e047..8efd250243 100644
--- a/reco/mq/CMakeLists.txt
+++ b/reco/mq/CMakeLists.txt
@@ -30,7 +30,7 @@ set(PUBLIC_DEPS
 set(PRIVATE_DEPS
   FairRoot::Base
   FairRoot::Online
-  Algo
+  AlgoOffline
   )
 
 set(INTERFACE_DEPENDENCIES
@@ -41,8 +41,8 @@ set(INTERFACE_DEPENDENCIES
 set(EXE_NAME MqDevUnpack)
 set(SRCS CbmDevUnpack.cxx runUnpack.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS})
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
@@ -51,8 +51,8 @@ generate_cbm_executable()
 set(EXE_NAME MqDevTrigger)
 set(SRCS CbmDevTrigger.cxx runTrigger.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS})
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
@@ -61,8 +61,8 @@ generate_cbm_executable()
 set(EXE_NAME MqDevBuildEvents)
 set(SRCS CbmDevBuildEvents.cxx runBuildEvents.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS})
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
@@ -71,8 +71,8 @@ generate_cbm_executable()
 set(EXE_NAME MqDevEventSink)
 set(SRCS CbmDevEventSink.cxx runEventSink.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS})
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
diff --git a/reco/offline/steer/CMakeLists.txt b/reco/offline/steer/CMakeLists.txt
index a8b907183a..8ada18e7a3 100644
--- a/reco/offline/steer/CMakeLists.txt
+++ b/reco/offline/steer/CMakeLists.txt
@@ -18,6 +18,7 @@ endif()
 set(LIBRARY_NAME CbmRecoOfflineSteer)
 set(LINKDEF RootLinkDef.h)
 set(PUBLIC_DEPENDENCIES
+  AlgoOffline
   CbmData
   FairRoot::Base
   ROOT::Core
@@ -48,7 +49,6 @@ set(PRIVATE_DEPENDENCIES
   CbmSimSteer
   L1
   KF
-  AlgoOffline
   )
 
 # Check if the compiler supports std::execution in the respective STL
diff --git a/reco/steer/CMakeLists.txt b/reco/steer/CMakeLists.txt
index 98b6c7b43a..83a145c578 100644
--- a/reco/steer/CMakeLists.txt
+++ b/reco/steer/CMakeLists.txt
@@ -36,6 +36,7 @@ set(PRIVATE_DEPENDENCIES
   CbmTrdReco
   CbmBmonReco
   external::fles_monitoring
+  external::fles_logging # Needed for TimesliceSource in CbmSourceTsArchive, not sure of conflicts with FairLogger
   )
 
 set(INTERFACE_DEPENDENCIES
-- 
GitLab