feat: depend on k4FWCore

eic · Dec 20, 2023 · 38849c3 · 38849c3
1 parent 19e82c5
commit 38849c3
Show file tree

Hide file tree

Showing 212 changed files with 444 additions and 2,882 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,6 +88,7 @@ else()
 endif()
 
 find_package(Gaudi)
+find_package(k4FWCore)
 add_subdirectory(JugBase)
 add_subdirectory(JugAlgo)
 add_subdirectory(JugDigi)

diff --git a/JugAlgo/JugAlgo/detail/DataProxy.h b/JugAlgo/JugAlgo/detail/DataProxy.h
@@ -8,7 +8,7 @@
 #include <algorithms/type_traits.h>
 
 #include <GaudiAlg/GaudiAlgorithm.h>
-#include <JugBase/DataHandle.h>
+#include <k4FWCore/DataHandle.h>
 
 namespace Jug::Algo::detail {
 

diff --git a/JugAlgo/src/components/AlgoServiceSvc.cpp b/JugAlgo/src/components/AlgoServiceSvc.cpp
@@ -5,7 +5,7 @@
 
 #include <GaudiKernel/Service.h>
 #include <JugAlgo/IAlgoServiceSvc.h>
-#include <JugBase/IGeoSvc.h>
+#include <k4Interface/IGeoSvc.h>
 
 #include <algorithms/geo.h>
 #include <algorithms/logger.h>
@@ -77,7 +77,7 @@ StatusCode AlgoServiceSvc::initialize() {
     }
     serviceSvc.setInit<algorithms::GeoSvc>([this](auto&& g) {
       this->info() << "Initializing algorithms::RandomSvc with the Juggler GeoSvc" << endmsg;
-      g.init(m_geoSvc->detector());
+      g.init(m_geoSvc->getDetector());
     });
     // setup random service
     info() << "Setting up algorithms::RandomSvc\n"

diff --git a/JugBase/CMakeLists.txt b/JugBase/CMakeLists.txt
@@ -6,28 +6,21 @@
 ################################################################################
 
 file(GLOB JugBase_sources CONFIGURE_DEPENDS src/*.cpp)
-file(GLOB JugBase_plugins CONFIGURE_DEPENDS src/Plugins/*.cpp)
-file(GLOB JugBase_utilities CONFIGURE_DEPENDS src/Utilities/*.cpp)
-gaudi_add_library(JugBase
-  SOURCES
-  ${JugBase_sources}
-  ${JugBase_plugins}
-  ${JugBase_utilities}
+gaudi_add_header_only_library(JugBase
   LINK
   Gaudi::GaudiKernel Gaudi::GaudiAlgLib
   podio::podioRootIO
   ROOT::Core ROOT::RIO ROOT::Tree
   DD4hep::DDRec
   ActsCore ActsPluginDD4hep
+  k4FWCore::k4FWCore
 )
 
-target_include_directories(JugBase PUBLIC
+target_include_directories(JugBase INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
-target_compile_options(JugBase PRIVATE -Wno-suggest-override)
-
 file(GLOB JugBasePlugins_sources CONFIGURE_DEPENDS src/components/*.cpp)
 gaudi_add_module(JugBasePlugins
   SOURCES

diff --git a/JugBase/JugBase/ACTSLogger.h b/JugBase/JugBase/ACTSLogger.h