Changes needed for spack mpd build and test

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
               $<$<CXX_COMPILER_ID:Clang>:-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 )

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()

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()
 

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

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

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

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)

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