CMake: Set FairLogger dep instead of manual includes

ShipSoft · Oct 3, 2024 · 378929f · 378929f
1 parent 2eb7c79
commit 378929f
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,6 +44,7 @@ it in future.
 * Housekeeping: Use FairRoot's `find_package2` to find ROOT, VMC, fmt
 * Housekeeping: Bump minimum ROOT version to 6.26
 * Housekeeping: Use find_package to find BOOST
+* Housekeeping: Set FairLogger dep instead of manual includes
 
 ### Removed
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -161,7 +161,6 @@ SetBasicVariables()
 Set(SYSTEM_INCLUDE_DIRECTORIES
  ${SYSTEM_INCLUDE_DIRECTORIES}
  ${BASE_INCLUDE_DIRECTORIES}
- ${FAIRLOGGER_INCLUDE_DIR}
 )
 
 # Set the library version in the main CMakeLists.txt

diff --git a/TimeDet/CMakeLists.txt b/TimeDet/CMakeLists.txt
@@ -7,8 +7,7 @@ ${CMAKE_SOURCE_DIR}/shipdata
 ${CMAKE_SOURCE_DIR}/TimeDet
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -28,7 +27,7 @@ TimeDet.cxx
 Set(LINKDEF TimeDetLinkDef.h)
 Set(LIBRARY_NAME TimeDet)
 Set(DEPENDENCIES
- Base ShipData
+ Base ShipData FairLogger::FairLogger
 )
 
 GENERATE_LIBRARY()
diff --git a/UpstreamTagger/CMakeLists.txt b/UpstreamTagger/CMakeLists.txt
@@ -7,8 +7,7 @@ ${CMAKE_SOURCE_DIR}/shipdata
 ${CMAKE_SOURCE_DIR}/UpstreamTagger
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -28,7 +27,7 @@ Set(HEADERS )
 Set(LINKDEF UpstreamTaggerLinkDef.h)
 Set(LIBRARY_NAME UpstreamTagger)
 Set(DEPENDENCIES
- Base ShipData
+ Base ShipData FairLogger::FairLogger
 )
 
 GENERATE_LIBRARY()
diff --git a/charmdet/CMakeLists.txt b/charmdet/CMakeLists.txt
@@ -13,8 +13,7 @@ ${CMAKE_SOURCE_DIR}/millepede
 ${ROOT_INCLUDE_DIR}
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -56,6 +55,6 @@ MillepedeCaller.cxx
 Set(HEADERS )
 Set(LINKDEF BoxLinkDef.h)
 Set(LIBRARY_NAME charmdet)
-Set(DEPENDENCIES Base ShipData GeoBase ParBase Geom Core genfit millepede)
+set(DEPENDENCIES Base ShipData GeoBase ParBase Geom Core genfit millepede FairLogger::FairLogger)
 
 GENERATE_LIBRARY()
diff --git a/ecal/CMakeLists.txt b/ecal/CMakeLists.txt
@@ -8,8 +8,7 @@ ${CMAKE_SOURCE_DIR}/shipdata
 ${CMAKE_SOURCE_DIR}/ecal
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -50,7 +49,7 @@ ecalMatch.cxx
 Set(LINKDEF ecalLinkDef.h)
 Set(LIBRARY_NAME ecal)
 Set(DEPENDENCIES
- Base ShipData
+ Base ShipData FairLogger::FairLogger
 )
 
 GENERATE_LIBRARY()
diff --git a/field/CMakeLists.txt b/field/CMakeLists.txt
@@ -8,8 +8,6 @@ ${ROOT_INCLUDE_DIR}
 ${GEANT4_VMC_INCLUDE_DIR}
 ${GEANT4_INCLUDE_DIR}
 ${FAIRROOT_INCLUDE_DIR}
-${FairLogger_INCDIR}
-${FMT_INCLUDE_DIR}
 ${VMC_INCLUDE_DIRS}
 )
 
@@ -42,6 +40,7 @@ set(LINKDEF FieldLinkDef.h)
 Set(LIBRARY_NAME ShipField)
 Set(DEPENDENCIES
  Base
+ FairLogger::FairLogger
 )
 
 GENERATE_LIBRARY()
diff --git a/hcal/CMakeLists.txt b/hcal/CMakeLists.txt
@@ -7,8 +7,7 @@ ${CMAKE_SOURCE_DIR}/shipdata
 ${CMAKE_SOURCE_DIR}/hcal
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -36,7 +35,7 @@ hcalAnalysisSimple.cxx
 Set(LINKDEF hcalLinkDef.h)
 Set(LIBRARY_NAME hcal)
 Set(DEPENDENCIES
- Base ShipData
+ Base ShipData FairLogger::FairLogger
 )
 
 GENERATE_LIBRARY()
diff --git a/muon/CMakeLists.txt b/muon/CMakeLists.txt
@@ -8,8 +8,7 @@ ${CMAKE_SOURCE_DIR}/muon
 ${VMC_INCLUDE_DIRS}
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -30,7 +29,7 @@ muonHit.cxx
 Set(LINKDEF muonLinkDef.h)
 Set(LIBRARY_NAME muon)
 Set(DEPENDENCIES
- Base ShipData
+ Base ShipData FairLogger::FairLogger
 )
 
 GENERATE_LIBRARY()
diff --git a/muonShieldOptimization/CMakeLists.txt b/muonShieldOptimization/CMakeLists.txt
@@ -11,8 +11,7 @@ set(INCLUDE_DIRECTORIES
 ${CMAKE_SOURCE_DIR}/muonShieldOptimization ${VMC_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/veto ${CMAKE_SOURCE_DIR}/shipdata ${PYTHON_INCLUDE_DIRS}
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -32,6 +31,6 @@ simpleTarget.cxx
 Set(HEADERS )
 Set(LINKDEF muonShieldBackgroundLinkDef.h)
 Set(LIBRARY_NAME ShipMuonShieldBackground)
-Set(DEPENDENCIES Base GeoBase ParBase Geom Core)
+set(DEPENDENCIES Base GeoBase ParBase Geom Core FairLogger::FairLogger)
 
 GENERATE_LIBRARY()
diff --git a/nutaudet/CMakeLists.txt b/nutaudet/CMakeLists.txt
@@ -10,14 +10,12 @@ ${ROOT_INCLUDE_DIR}
 ${VMC_INCLUDE_DIRS}
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
 ${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
-
 )
 
 link_directories( ${LINK_DIRECTORIES})
@@ -38,6 +36,6 @@ TTPoint.cxx
 Set(HEADERS )
 Set(LINKDEF nutaudetLinkDef.h)
 Set(LIBRARY_NAME nutaudet)
-Set(DEPENDENCIES Base ShipData GeoBase ParBase Geom Core)
+set(DEPENDENCIES Base ShipData GeoBase ParBase Geom Core FairLogger::FairLogger)
 
 GENERATE_LIBRARY()
diff --git a/online/CMakeLists.txt b/online/CMakeLists.txt
@@ -10,7 +10,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
  ${SYSTEM_INCLUDE_DIRECTORIES}
 )
 
-include_directories(${INCLUDE_DIRECTORIES}  ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR})
+include_directories(${INCLUDE_DIRECTORIES} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 
@@ -38,7 +38,8 @@ Set(LINKDEF OnlineLinkDef.h)
 Set(LIBRARY_NAME Online)
 
 Set(DEPENDENCIES
- Base # MbsAPI
+ Base
+ FairLogger::FairLogger
 )
 
 GENERATE_LIBRARY()
diff --git a/passive/CMakeLists.txt b/passive/CMakeLists.txt
@@ -7,13 +7,12 @@ ${CMAKE_SOURCE_DIR}/passive
 ${VMC_INCLUDE_DIRS}
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${GEANT4_INCLUDE_DIR} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR} )
+include_directories(${INCLUDE_DIRECTORIES} ${GEANT4_INCLUDE_DIR} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 Message(STATUS "include directories ${GEANT4_INCLUDE_DIR}")
 set(LINK_DIRECTORIES
 ${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
-
 )
 
 link_directories( ${LINK_DIRECTORIES})
@@ -34,6 +33,6 @@ ShipGoliath.cxx
 Set(HEADERS )
 Set(LINKDEF PassiveLinkDef.h)
 Set(LIBRARY_NAME ShipPassive)
-Set(DEPENDENCIES Base GeoBase ParBase Geom Core)
+set(DEPENDENCIES Base GeoBase ParBase Geom Core FairLogger::FairLogger)
 
 GENERATE_LIBRARY()
diff --git a/preshower/CMakeLists.txt b/preshower/CMakeLists.txt
@@ -7,8 +7,7 @@ ${CMAKE_SOURCE_DIR}/shipdata
 ${CMAKE_SOURCE_DIR}/preshower
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -28,7 +27,7 @@ preshowerPoint.cxx
 Set(LINKDEF preshowerLinkDef.h)
 Set(LIBRARY_NAME preshower)
 Set(DEPENDENCIES
- Base ShipData
+ Base ShipData FairLogger::FairLogger
 )
 
 GENERATE_LIBRARY()
diff --git a/shipdata/CMakeLists.txt b/shipdata/CMakeLists.txt
@@ -9,8 +9,7 @@ ${CMAKE_SOURCE_DIR}/genfit/fitters/include
 ${VMC_INCLUDE_DIRS}
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -33,6 +32,6 @@ TrackInfo.cxx
 Set(HEADERS )
 Set(LINKDEF MCStackLinkDef.h)
 Set(LIBRARY_NAME ShipData)
-Set(DEPENDENCIES Base EG Physics Core genfit)
+set(DEPENDENCIES Base EG Physics Core genfit FairLogger::FairLogger)
 
 GENERATE_LIBRARY()
diff --git a/shipgen/CMakeLists.txt b/shipgen/CMakeLists.txt
@@ -18,7 +18,7 @@ ${EVTGEN_INCLUDE_DIR}
 ${EVTGEN_INCLUDE_DIR}/..
 )
 
-include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR})
+include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -50,6 +50,6 @@ ALPACAGenerator.cxx
 set(LINKDEF GenLinkDef.h)
 set(LIBRARY_NAME ShipGen)
 
-set(DEPENDENCIES Base ShipData EvtGen EvtGenExternal)
+set(DEPENDENCIES Base ShipData EvtGen EvtGenExternal FairLogger::FairLogger)
 
 GENERATE_LIBRARY()
diff --git a/splitcal/CMakeLists.txt b/splitcal/CMakeLists.txt
@@ -7,8 +7,7 @@ ${CMAKE_SOURCE_DIR}/shipdata
 ${CMAKE_SOURCE_DIR}/splitcal
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -30,7 +29,7 @@ splitcalCluster.cxx
 Set(LINKDEF splitcalLinkDef.h)
 Set(LIBRARY_NAME splitcal)
 Set(DEPENDENCIES
- Base ShipData
+ Base ShipData FairLogger::FairLogger
 )
 
 GENERATE_LIBRARY()
diff --git a/strawtubes/CMakeLists.txt b/strawtubes/CMakeLists.txt
@@ -7,8 +7,7 @@ ${CMAKE_SOURCE_DIR}/shipdata
 ${CMAKE_SOURCE_DIR}/strawtubes
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -30,7 +29,7 @@ Tracklet.cxx
 Set(LINKDEF strawtubesLinkDef.h)
 Set(LIBRARY_NAME strawtubes)
 Set(DEPENDENCIES
- Base ShipData
+ Base ShipData FairLogger::FairLogger
 )
 
 GENERATE_LIBRARY()
diff --git a/veto/CMakeLists.txt b/veto/CMakeLists.txt
@@ -7,8 +7,7 @@ ${CMAKE_SOURCE_DIR}/shipdata
 ${CMAKE_SOURCE_DIR}/veto
 )
 
-include_directories( ${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR} ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}
-)
+include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
@@ -30,7 +29,7 @@ vetoHitOnTrack.cxx
 Set(LINKDEF vetoLinkDef.h)
 Set(LIBRARY_NAME veto)
 Set(DEPENDENCIES
- Base ShipData
+ Base ShipData FairLogger::FairLogger
 )
 
 GENERATE_LIBRARY()