SBNSoftware · PetrilloAtWork · Jul 5, 2026 · Jul 5, 2026 · Jul 7, 2026 · Jul 7, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,20 +17,25 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 # cmake_policy(VERSION 3.19)
 
 find_package(cetmodules 3.24.01 REQUIRED)
-#project(icaruscode VERSION 10.20.09 LANGUAGES CXX)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.20.09p01)
-project(icaruscode LANGUAGES CXX)
+# Version tag will be always stored in ${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING
+# (which is a special MRB provision to support free(r) version string forms which CMake does not)
+# and also propagated to CMake's version when the format is compatible
+set(ProjectName "icaruscode")
+set(${ProjectName}_CMAKE_PROJECT_VERSION_STRING "10.20.09p01") # this is our project version!
+
+if ( "${${ProjectName}_CMAKE_PROJECT_VERSION_STRING}" MATCHES "^[0-9]+(\\.[0-9]+(\\.[0-9]+(\\.[0-9]+)?)?)?$" )
+  set(OptionalVersionArg VERSION "${${ProjectName}_CMAKE_PROJECT_VERSION_STRING}")
+endif()
+project(${ProjectName} ${OptionalVersionArg} LANGUAGES CXX)
+unset(ProjectName)
+unset(OptionalVersionArg)
 
 message(STATUS
   "\n-- ============================================================================="
-  "\n-- === *** Start of configuration of ${PROJECT_NAME} ***"
-  "\n-- ===")
-
-# cetbuildtools contains our cmake modules
-#find_package(cetbuildtools REQUIRED)
-
-#list(APPEND CMAKE_MODULE_PATH $ENV{CANVAS_ROOT_IO_DIR}/Modules $ENV{ART_DIR}/Modules )
+  "\n-- === *** Start of configuration of ${PROJECT_NAME} ${${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING} ***"
+  "\n-- ==="
+  )
 
 include(CetCMakeEnv)
 cet_cmake_env()
@@ -115,7 +120,6 @@ message(STATUS
   "\n-- ==="
   "\n-- === *** End of configuration of ${PROJECT_NAME} ***"
   "\n-- ============================================================================="
-  "\n-- SQLITE3: ${SQLITE3}"
   "\n-- "
   )
 

diff --git a/icaruscode/Analysis/CMakeLists.txt b/icaruscode/Analysis/CMakeLists.txt
@@ -41,17 +41,17 @@ set(         MODULE_LIBRARIES
 		Eigen3::Eigen
 	)
 
-cet_build_plugin(AnalysisTree art::module LIBRARIES ${MODULE_LIBRARIES})
-cet_build_plugin(HitEfficiencyAna art::module LIBRARIES ${MODULE_LIBRARIES})
-cet_build_plugin(ICARUSPurityDQM art::module LIBRARIES ${MODULE_LIBRARIES})
-cet_build_plugin(RawDigitAna art::module LIBRARIES ${MODULE_LIBRARIES})
-cet_build_plugin(TPCPurityInfoAna art::module LIBRARIES ${MODULE_LIBRARIES})
-cet_build_plugin(TPCPurityMonitor art::module LIBRARIES ${MODULE_LIBRARIES})
+cet_build_plugin(AnalysisTree art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES})
+cet_build_plugin(HitEfficiencyAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES})
+cet_build_plugin(ICARUSPurityDQM art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES})
+cet_build_plugin(RawDigitAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES})
+cet_build_plugin(TPCPurityInfoAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES})
+cet_build_plugin(TPCPurityMonitor art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES})
 set_property(SOURCE TPCPurityMonitor_module.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT)
-cet_build_plugin(ThroughgoingmuonAnalyzer art::module LIBRARIES ${MODULE_LIBRARIES})
+cet_build_plugin(ThroughgoingmuonAnalyzer art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES})
 set_property(SOURCE ThroughgoingmuonAnalyzer_module.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT)
-cet_build_plugin(TrackHitAna art::module LIBRARIES ${MODULE_LIBRARIES})
-cet_build_plugin(WireAna art::module LIBRARIES ${MODULE_LIBRARIES})
+cet_build_plugin(TrackHitAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES})
+cet_build_plugin(WireAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES})
 
 #install_headers()
 install_fhicl()

diff --git a/icaruscode/Analysis/overburden/CMakeLists.txt b/icaruscode/Analysis/overburden/CMakeLists.txt
@@ -1,4 +1,4 @@
-cet_build_plugin(OBAnaICARUS art::module LIBRARIES
+cet_build_plugin(OBAnaICARUS art::module LIBRARIES PRIVATE
         larcorealg::Geometry
 	larcore::Geometry_Geometry_service
 	larsim::Simulation

diff --git a/icaruscode/Analysis/tools/BasicRawDigitAnalysis_tool.cc b/icaruscode/Analysis/tools/BasicRawDigitAnalysis_tool.cc
@@ -10,7 +10,7 @@
 #include "messagefacility/MessageLogger/MessageLogger.h"
 
 #include "larcore/Geometry/WireReadout.h"
-#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h"
+#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h"
 #include "lardataalg/DetectorInfo/DetectorClocks.h"
 #include "lardata/DetectorInfoServices/DetectorPropertiesService.h"
 #include "larevt/CalibrationDBI/Interface/DetPedestalService.h"

diff --git a/icaruscode/Analysis/tools/BasicWireAnalysis_tool.cc b/icaruscode/Analysis/tools/BasicWireAnalysis_tool.cc
@@ -14,7 +14,7 @@
 #include "larevt/CalibrationDBI/Interface/DetPedestalProvider.h"
 #include "larreco/HitFinder/HitFinderTools/IWaveformTool.h"
 
-#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h"
+#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h"
 
 #include "TH1.h"
 #include "TH2.h"

diff --git a/icaruscode/Analysis/tools/CMakeLists.txt b/icaruscode/Analysis/tools/CMakeLists.txt
@@ -6,6 +6,8 @@ set(         TOOL_LIBRARIES
 		lardataobj::Simulation
 		lardataalg::DetectorInfo
 		icaruscode::TPC_SignalProcessing_RawDigitFilter_Algorithms
+		larreco::WaveformTool
+		sbnobj::ICARUS_TPC
 		larcorealg::Geometry
 		larcore::Geometry_Geometry_service
 		lardata::RecoObjects
@@ -34,18 +36,18 @@ set(         TOOL_LIBRARIES
 		FFTW3::FFTW3
 		)
 
-cet_build_plugin(BasicHitAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES})
-cet_build_plugin(BasicRawDigitAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES})
-cet_build_plugin(BasicTrackAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES})
-cet_build_plugin(BasicWireAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES})
-cet_build_plugin(HitEfficiencyAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES})
-cet_build_plugin(HitFinderAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES} SOURCE HitFinderAnalysis_tool.cc)
+cet_build_plugin(BasicHitAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES})
+cet_build_plugin(BasicRawDigitAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES})
+cet_build_plugin(BasicTrackAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES})
+cet_build_plugin(BasicWireAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES})
+cet_build_plugin(HitEfficiencyAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES})
+cet_build_plugin(HitFinderAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES})
 set_property(SOURCE HitFinderAnalysis_tool.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT)
-cet_build_plugin(SpacePointAnalysisMC art::tool LIBRARIES ${TOOL_LIBRARIES} SOURCE SpacePointAnalysisMC_tool.cc)
+cet_build_plugin(SpacePointAnalysisMC art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES})
 set_property(SOURCE SpacePointAnalysisMC_tool.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT)
-cet_build_plugin(SpacePointAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES} SOURCE SpacePointAnalysis_tool.cc)
+cet_build_plugin(SpacePointAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES})
 set_property(SOURCE SpacePointAnalysis_tool.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT)
-cet_build_plugin(TrackHitEfficiencyAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES} SOURCE TrackHitEfficiencyAnalysis_tool.cc)
+cet_build_plugin(TrackHitEfficiencyAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES})
 set_property(SOURCE TrackHitEfficiencyAnalysis_tool.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT)
 
 install_headers()

diff --git a/icaruscode/Analysis/tools/MCTruth/CMakeLists.txt b/icaruscode/Analysis/tools/MCTruth/CMakeLists.txt
@@ -58,9 +58,9 @@ set(TOOL_LIBRARIES lardataobj::RecoBase
 		CLHEP::Random
 	)
 
-cet_build_plugin(AssociationsTruth art::tool LIBRARIES ${TOOL_LIBRARIES})
-cet_build_plugin(BackTrackerTruth art::tool LIBRARIES ${TOOL_LIBRARIES})
-cet_build_plugin(MCTruthTestAna art::module LIBRARIES ${MODULE_LIBRARIES})
+cet_build_plugin(AssociationsTruth art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES})
+cet_build_plugin(BackTrackerTruth art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES})
+cet_build_plugin(MCTruthTestAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES})
 
 install_headers()
 install_source()

diff --git a/icaruscode/Analysis/trigger/CMakeLists.txt b/icaruscode/Analysis/trigger/CMakeLists.txt
@@ -16,7 +16,7 @@ art_make_library(
   )
 
 cet_build_plugin(TimedTrackSelector art::module
-  LIBRARIES
+  LIBRARIES PRIVATE
   icarusalg::Utilities
   lardataobj::AnalysisBase
   lardataobj::RecoBase
@@ -25,7 +25,7 @@ cet_build_plugin(TimedTrackSelector art::module
   )
 
 cet_build_plugin(TimedTrackSelectorCRT art::module
-  LIBRARIES
+  LIBRARIES PRIVATE
   icarusalg::Utilities
   lardataobj::AnalysisBase
   lardataobj::RecoBase
@@ -34,23 +34,23 @@ cet_build_plugin(TimedTrackSelectorCRT art::module
   )
 
 cet_build_plugin(BeamGateInfoFromTracks  art::module
-  LIBRARIES
+  LIBRARIES PRIVATE
   lardataobj::Simulation
   lardataobj::AnalysisBase
   lardataobj::RecoBase
   lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
   )
 
 cet_build_plugin(BeamGateInfoFromTracksCRT  art::module
-  LIBRARIES
+  LIBRARIES PRIVATE
   lardataobj::Simulation
   lardataobj::AnalysisBase
   lardataobj::RecoBase
   lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
   )
 
 cet_build_plugin(TimeTrackTreeStorage art::module
-  LIBRARIES
+  LIBRARIES PRIVATE
   icaruscode_Analysis_trigger
   icaruscode_PMT_Algorithms
   icaruscode_Decode_DataProducts
@@ -72,7 +72,7 @@ cet_build_plugin(TimeTrackTreeStorage art::module
 )
 
 cet_build_plugin(TimeTrackTreeStorageCRT art::module
-  LIBRARIES
+  LIBRARIES PRIVATE
   icaruscode::Analysis_trigger
   icaruscode_CRTUtils
   icaruscode::PMT_Algorithms

diff --git a/icaruscode/CRT/CMakeLists.txt b/icaruscode/CRT/CMakeLists.txt
@@ -22,7 +22,7 @@ art_make_library(
      )
 
 cet_build_plugin(CRTDetSim art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         larcorealg::Geometry
         sbnobj::ICARUS_CRT
         sbnobj::Common_CRT
@@ -38,7 +38,7 @@ cet_build_plugin(CRTDetSim art::module
         )
 
 cet_build_plugin(CRTSimHitProducer art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         larcorealg::Geometry
         sbnobj::ICARUS_CRT
         sbnobj::Common_CRT
@@ -54,7 +54,7 @@ cet_build_plugin(CRTSimHitProducer art::module
         )
 
 cet_build_plugin( CRTTrueHitProducer art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         larcorealg::Geometry
         sbnobj::ICARUS_CRT
         sbnobj::Common_CRT
@@ -75,7 +75,7 @@ cet_build_plugin( CRTTrueHitProducer art::module
         )
 
 cet_build_plugin(CRTTrackProducer art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         larcorealg::Geometry
         sbnobj::ICARUS_CRT
         sbnobj::Common_CRT
@@ -92,7 +92,7 @@ cet_build_plugin(CRTTrackProducer art::module
         )
 
 cet_build_plugin(CRTSimAnalysis art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         sbnobj::ICARUS_CRT
         sbnobj::Common_CRT
         icaruscode_CRTUtils
@@ -112,7 +112,7 @@ cet_build_plugin(CRTSimAnalysis art::module
         )
 
 cet_build_plugin(CRTDataAnalysis art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         artdaq_core::artdaq-core_Data
         sbnobj::ICARUS_CRT
         sbnobj::Common_CRT
@@ -133,7 +133,7 @@ cet_build_plugin(CRTDataAnalysis art::module
         )
 
 cet_build_plugin(CRTCalibrationAnalysis art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         sbnobj::Common_CRT
         icaruscode_CRTUtils
         larcore::Geometry_Geometry_service
@@ -153,7 +153,7 @@ cet_build_plugin(CRTCalibrationAnalysis art::module
 
 
 cet_build_plugin(CrtOpHitMatchAnalysis art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         sbnobj::ICARUS_CRT
         sbnobj::Common_CRT
         icaruscode_CRTUtils
@@ -172,7 +172,7 @@ cet_build_plugin(CrtOpHitMatchAnalysis art::module
         )
 
 cet_build_plugin(CRTPMTMatchingAna art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         sbnobj::ICARUS_CRT
         sbnobj::Common_CRT
         icaruscode_CRTUtils
@@ -193,7 +193,7 @@ cet_build_plugin(CRTPMTMatchingAna art::module
 )
 
 cet_build_plugin(CRTPMTMatchingProducer art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         sbnobj::Common_CRT
         icaruscode::CRTUtils
         larcore::Geometry_Geometry_service
@@ -205,7 +205,7 @@ cet_build_plugin(CRTPMTMatchingProducer art::module
 )
 
 cet_build_plugin(CRTTruthMatchAnalysis art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         sbnobj::ICARUS_CRT
         sbnobj::Common_CRT
         icaruscode_CRTUtils
@@ -225,7 +225,7 @@ cet_build_plugin(CRTTruthMatchAnalysis art::module
         )
 
 cet_build_plugin( CRTAutoVeto art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         sbnobj::ICARUS_CRT
         sbnobj::Common_CRT
         icaruscode_CRTUtils
@@ -252,7 +252,7 @@ cet_build_plugin( CRTAutoVeto art::module
         )
 
 cet_build_plugin( FlashResAna art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         larcore::Geometry_Geometry_service
         larcorealg::Geometry
         nusimdata::SimulationBase
@@ -277,7 +277,7 @@ cet_build_plugin( FlashResAna art::module
         )
 
 cet_build_plugin( PhotBackground art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         larcore::Geometry_Geometry_service
         larcorealg::Geometry
         nusimdata::SimulationBase
@@ -300,7 +300,7 @@ cet_build_plugin( PhotBackground art::module
         )
 
 cet_build_plugin(CRTTPCMatchingAna art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
               sbnobj::ICARUS_CRT
               sbnobj::Common_CRT
               icaruscode_CRTUtils
@@ -329,10 +329,11 @@ cet_build_plugin(CRTTPCMatchingAna art::module
               ROOT::RooFit
               ROOT::RooFitCore
 )
-simple_plugin(CRTTPCTruthEff module
+cet_build_plugin(CRTTPCTruthEff art::module
+     LIBRARIES PRIVATE
               sbnobj::ICARUS_CRT
               sbnobj::Common_CRT
-              icaruscode_CRTUtils
+              icaruscode::CRTUtils
               larcorealg::Geometry
               larcore::Geometry_Geometry_service
               larsim::Simulation lardataobj::Simulation
@@ -361,7 +362,7 @@ simple_plugin(CRTTPCTruthEff module
 )
 
 cet_build_plugin(CRTT0Tagging art::module
-     LIBRARIES
+     LIBRARIES PRIVATE
         icaruscode::IcarusObj
         icaruscode_CRTMatchingUtils
         icaruscode_CRTUtils