From a34402c41895114d5c689847b9ae37009db5bb78 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Tue, 14 Jul 2026 16:04:12 -0500 Subject: [PATCH 1/6] Remove find_package(protobuf) which is called in FindTensorFlow.cmake --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e7100efe..7c87cb08f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,6 @@ message(STATUS "${PROJECT_NAME} repository tag: ${GIT_REPOSITORY_TAG}") install_source(LIST RepositoryTag) # these are minimum required versions, not the actual product versions -find_package( protobuf REQUIRED ) find_package( art REQUIRED ) find_package( art_root_io REQUIRED ) find_package( artdaq_core REQUIRED ) From 7105c3027762260295c658ca3ac8f994f075d050 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Tue, 14 Jul 2026 20:00:54 -0500 Subject: [PATCH 2/6] Use GENIE_INCLUDE_DIRS. Add -Wno-error=array-bounds --- CMakeLists.txt | 2 +- sbndcode/MCTruthExtractor/CMakeLists.txt | 2 +- sbndcode/MCTruthExtractor/alg/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c87cb08f..53df0ed12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ cet_set_compiler_flags(DIAGS CAUTIOUS WERROR NO_UNDEFINED EXTRA_FLAGS -pedantic -Wno-unused-local-typedefs - -Wno-uninitialized + -Wno-uninitialized -Wno-error=array-bounds $<$:-Wno-return-stack-address> ) ##add_definitions(-DGENIE_PRE_R3) diff --git a/sbndcode/MCTruthExtractor/CMakeLists.txt b/sbndcode/MCTruthExtractor/CMakeLists.txt index 0166f6ac6..2cac5c7c2 100644 --- a/sbndcode/MCTruthExtractor/CMakeLists.txt +++ b/sbndcode/MCTruthExtractor/CMakeLists.txt @@ -30,6 +30,6 @@ set( MODULE_LIBRARIES CLHEP::CLHEP ) cet_build_plugin( NuAna art::module SOURCE NuAna_module.cc LIBRARIES ${MODULE_LIBRARIES}) -target_include_directories (sbndcode_MCTruthExtractor_NuAna_module PRIVATE $ENV{GENIE_INC}/GENIE ) +target_include_directories (sbndcode_MCTruthExtractor_NuAna_module PRIVATE $ENV{GENIE_INC}/GENIE ${GENIE_INCLUDE_DIRS} ) install_headers() install_fhicl() diff --git a/sbndcode/MCTruthExtractor/alg/CMakeLists.txt b/sbndcode/MCTruthExtractor/alg/CMakeLists.txt index 6fd21909c..77332c285 100644 --- a/sbndcode/MCTruthExtractor/alg/CMakeLists.txt +++ b/sbndcode/MCTruthExtractor/alg/CMakeLists.txt @@ -19,6 +19,6 @@ art_make_library( SOURCE NuAnaAlg.cxx CLHEP::CLHEP ROOT::Core ) -target_include_directories (sbndcode_MCTruthExtractor_alg PRIVATE $ENV{GENIE_INC}/GENIE ) +target_include_directories (sbndcode_MCTruthExtractor_alg PRIVATE $ENV{GENIE_INC}/GENIE ${GENIE_INCLUDE_DIRS}) install_headers() From 69559616f139554cfbec752b4b39fcd1349dee58 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Wed, 15 Jul 2026 11:22:10 -0500 Subject: [PATCH 3/6] Set environment variables needed for tests --- test/Geometry/CMakeLists.txt | 9 +++++++-- test/Geometry/CRTGeometry/CMakeLists.txt | 7 +++++++ test/JobConfigurations/CMakeLists.txt | 7 +++++++ test/LArSoftConfigurations/CMakeLists.txt | 7 +++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/test/Geometry/CMakeLists.txt b/test/Geometry/CMakeLists.txt index f1794ca1b..a753efce2 100644 --- a/test/Geometry/CMakeLists.txt +++ b/test/Geometry/CMakeLists.txt @@ -1,6 +1,11 @@ - +include(CetTest) # geometry test on SBND geometries - +cet_transitive_paths(FHICL_DIR BINARY IN_TREE) +cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${CMAKE_CURRENT_LIST_DIR}) +cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE) +cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR}) +cet_transitive_paths(GDML_DIR BINARY IN_TREE) +cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_GDML_DIR}) # these tests run a FCL file and fail only if lar exits with a bad exit code; # they are fast and always run. # FCL files need to be copied to the test area (DATAFILES directive) since they diff --git a/test/Geometry/CRTGeometry/CMakeLists.txt b/test/Geometry/CRTGeometry/CMakeLists.txt index b29b9dae6..322438d93 100644 --- a/test/Geometry/CRTGeometry/CMakeLists.txt +++ b/test/Geometry/CRTGeometry/CMakeLists.txt @@ -15,6 +15,13 @@ cet_build_plugin( SBNDCRTGeometryTest art::module LIBRARIES NO_INSTALL ) +cet_transitive_paths(FHICL_DIR BINARY IN_TREE) +cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ) +cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE) +cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR}) +cet_transitive_paths(GDML_DIR BINARY IN_TREE) +cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_GDML_DIR}) + cet_test(SBNDCRTGeometryTest_1 HANDBUILT TEST_EXEC lar TEST_ARGS --rethrow-all --config SBNDCRTGeometryTest.fcl -n 1 diff --git a/test/JobConfigurations/CMakeLists.txt b/test/JobConfigurations/CMakeLists.txt index d0ca6f7e2..35a1bdb23 100644 --- a/test/JobConfigurations/CMakeLists.txt +++ b/test/JobConfigurations/CMakeLists.txt @@ -1,3 +1,10 @@ +include(CetTest) +cet_transitive_paths(FHICL_DIR BINARY IN_TREE) +cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${CMAKE_CURRENT_LIST_DIR}) +cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE) +cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR}) +cet_transitive_paths(GDML_DIR BINARY IN_TREE) + # for PREBUILT tests, the test name is the executable name, and no argument is allowed cet_test(fast_simulation_reconstruction_test_electrons.sh PREBUILT) cet_test(fast_simulation_reconstruction_test_muons.sh PREBUILT) diff --git a/test/LArSoftConfigurations/CMakeLists.txt b/test/LArSoftConfigurations/CMakeLists.txt index 268611077..882db2c6e 100644 --- a/test/LArSoftConfigurations/CMakeLists.txt +++ b/test/LArSoftConfigurations/CMakeLists.txt @@ -1,4 +1,11 @@ # the executables are tests from lardata +cet_transitive_paths(FHICL_DIR BINARY IN_TREE) +cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ) +cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE) +cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR}) +cet_transitive_paths(GDML_DIR BINARY IN_TREE) +cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_GDML_DIR}) + cet_test( DetectorClocksSBND_test HANDBUILT DATAFILES dettest_sbnd.fcl From d2203169b3ed149afb2e986eb5fe683ce17ac5b2 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Wed, 15 Jul 2026 15:31:41 -0500 Subject: [PATCH 4/6] Update test environment variables --- test/JobConfigurations/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/JobConfigurations/CMakeLists.txt b/test/JobConfigurations/CMakeLists.txt index 35a1bdb23..e0a7cb793 100644 --- a/test/JobConfigurations/CMakeLists.txt +++ b/test/JobConfigurations/CMakeLists.txt @@ -4,6 +4,7 @@ cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${CM cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE) cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR}) cet_transitive_paths(GDML_DIR BINARY IN_TREE) +cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_GDML_DIR} ${sbndcode_BINARY_DIR}/scripts) # for PREBUILT tests, the test name is the executable name, and no argument is allowed cet_test(fast_simulation_reconstruction_test_electrons.sh PREBUILT) From 8ecaf409fd8e0c819e58f2df9c6976382cf96360 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Thu, 16 Jul 2026 09:49:52 -0500 Subject: [PATCH 5/6] More environment variables for tests --- test/GENIE/CMakeLists.txt | 8 ++++++++ test/JobConfigurations/CMakeLists.txt | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/test/GENIE/CMakeLists.txt b/test/GENIE/CMakeLists.txt index 3489662f0..5e5eef4c1 100644 --- a/test/GENIE/CMakeLists.txt +++ b/test/GENIE/CMakeLists.txt @@ -1,3 +1,11 @@ + +cet_transitive_paths(FHICL_DIR BINARY IN_TREE) +cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${CMAKE_CURRENT_LIST_DIR}) +cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE) +cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR}) +cet_transitive_paths(GDML_DIR BINARY IN_TREE) +cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_GDML_DIR}) + cet_test(CheckGENIEGeomScan HANDBUILT TEST_EXEC python TEST_ARGS ${CMAKE_CURRENT_SOURCE_DIR}/check_genie_geom_scan.py diff --git a/test/JobConfigurations/CMakeLists.txt b/test/JobConfigurations/CMakeLists.txt index e0a7cb793..96834efde 100644 --- a/test/JobConfigurations/CMakeLists.txt +++ b/test/JobConfigurations/CMakeLists.txt @@ -2,9 +2,10 @@ include(CetTest) cet_transitive_paths(FHICL_DIR BINARY IN_TREE) cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${CMAKE_CURRENT_LIST_DIR}) cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE) -cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR}) +cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR} ${sbnobj_BINARY_DIR}/lib) cet_transitive_paths(GDML_DIR BINARY IN_TREE) cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_GDML_DIR} ${sbndcode_BINARY_DIR}/scripts) +cet_test_env("SBNDCODE_DIR=${PROJECT_SOURCE_DIR}") # for PREBUILT tests, the test name is the executable name, and no argument is allowed cet_test(fast_simulation_reconstruction_test_electrons.sh PREBUILT) From ade416ac53dfb2a40a1269aee0faac918a310930 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Thu, 16 Jul 2026 11:25:09 -0500 Subject: [PATCH 6/6] Add sbnobj source path to ROOT_INCLUDE_PATH --- test/JobConfigurations/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/JobConfigurations/CMakeLists.txt b/test/JobConfigurations/CMakeLists.txt index 96834efde..f66a68ecc 100644 --- a/test/JobConfigurations/CMakeLists.txt +++ b/test/JobConfigurations/CMakeLists.txt @@ -6,7 +6,7 @@ cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR} ${sbno cet_transitive_paths(GDML_DIR BINARY IN_TREE) cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_GDML_DIR} ${sbndcode_BINARY_DIR}/scripts) cet_test_env("SBNDCODE_DIR=${PROJECT_SOURCE_DIR}") - +cet_test_env_prepend(ROOT_INCLUDE_PATH ${sbnobj_SOURCE_DIR}) # for PREBUILT tests, the test name is the executable name, and no argument is allowed cet_test(fast_simulation_reconstruction_test_electrons.sh PREBUILT) cet_test(fast_simulation_reconstruction_test_muons.sh PREBUILT)