diff --git a/CMakeLists.txt b/CMakeLists.txt index a7bb1cc52..5d74df4cc 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) @@ -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 ) 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() 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/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..f66a68ecc 100644 --- a/test/JobConfigurations/CMakeLists.txt +++ b/test/JobConfigurations/CMakeLists.txt @@ -1,3 +1,12 @@ +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} ${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}") +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) 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