Changes needed for spack mpd build and test

CMakeLists.txt

@@ -20,7 +20,7 @@ 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)
+project(icaruscode VERSION 10.20.09.01 LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="
@@ -46,7 +46,6 @@ cet_set_compiler_flags(DIAGS CAUTIOUS
 cet_report_compiler_flags(REPORT_THRESHOLD VERBOSE)
 
 #these are minimum required versions,not thea ctual product versions
-find_package(larsoft REQUIRED )
 find_package(libwda REQUIRED )
 find_package(PostgreSQL REQUIRED )
 find_package(Eigen3 REQUIRED )

CMakePresets.json

@@ -0,0 +1,132 @@
+{
+   "configurePresets" : [
+      {
+         "cacheVariables" : {
+            "CMAKE_BUILD_TYPE" : {
+               "type" : "STRING",
+               "value" : "RelWithDebInfo"
+            },
+            "CMAKE_CXX_EXTENSIONS" : {
+               "type" : "BOOL",
+               "value" : "OFF"
+            },
+            "CMAKE_CXX_STANDARD_REQUIRED" : {
+               "type" : "BOOL",
+               "value" : "ON"
+            },
+            "icaruscode_ADD_NOARCH_DIRS_INIT" : {
+               "type" : "INTERNAL",
+               "value" : "GDML_DIR;FHICL_DIR;WP_DIR;FW_DIR"
+            },
+            "icaruscode_FHICL_DIR_INIT" : {
+               "type" : "STRING",
+               "value" : "job"
+            },
+            "icaruscode_FW_DIR_INIT" : {
+               "type" : "STRING",
+               "value" : "scripts"
+            },
+            "icaruscode_GDML_DIR_INIT" : {
+               "type" : "STRING",
+               "value" : "gdml"
+            },
+            "icaruscode_WP_DIR_INIT" : {
+               "type" : "STRING",
+               "value" : "wire-cell-cfg"
+            }
+         },
+         "description" : "Configuration settings translated from ups/product_deps",
+         "displayName" : "Configuration from product_deps",
+         "hidden" : true,
+         "name" : "from_product_deps"
+      },
+      {
+         "cacheVariables" : {
+            "CMAKE_CXX_COMPILER" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_CXX_COMPILER}"
+            },
+            "CMAKE_CXX_STANDARD" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_CXX_STANDARD}"
+            },
+            "CMAKE_C_COMPILER" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_C_COMPILER}"
+            },
+            "CMAKE_Fortran_COMPILER" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_Fortran_COMPILER}"
+            },
+            "UPS_CXX_COMPILER_ID" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_CXX_COMPILER_ID}"
+            },
+            "UPS_CXX_COMPILER_VERSION" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_CXX_COMPILER_VERSION}"
+            },
+            "UPS_C_COMPILER_ID" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_C_COMPILER_ID}"
+            },
+            "UPS_C_COMPILER_VERSION" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_C_COMPILER_VERSION}"
+            },
+            "UPS_Fortran_COMPILER_ID" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_Fortran_COMPILER_ID}"
+            },
+            "UPS_Fortran_COMPILER_VERSION" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_Fortran_COMPILER_VERSION}"
+            },
+            "WANT_UPS" : {
+               "type" : "BOOL",
+               "value" : true
+            },
+            "icaruscode_EXEC_PREFIX_INIT" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_FQ_DIR}"
+            },
+            "icaruscode_UPS_BUILD_ONLY_DEPENDENCIES_INIT" : {
+               "type" : "STRING",
+               "value" : "cetmodules"
+            },
+            "icaruscode_UPS_PRODUCT_FLAVOR_INIT" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_FLAVOR}"
+            },
+            "icaruscode_UPS_PRODUCT_NAME_INIT" : {
+               "type" : "STRING",
+               "value" : "icaruscode"
+            },
+            "icaruscode_UPS_QUALIFIER_STRING_INIT" : {
+               "type" : "STRING",
+               "value" : "$env{CETPKG_QUALSPEC}"
+            }
+         },
+         "description" : "Extra configuration for UPS package generation",
+         "displayName" : "UPS extra configuration",
+         "hidden" : true,
+         "name" : "extra_for_UPS"
+      },
+      {
+         "description" : "Default configuration including settings from ups/product_deps",
+         "displayName" : "Default configuration",
+         "inherits" : "from_product_deps",
+         "name" : "default"
+      },
+      {
+         "description" : "Default configuration for UPS package generation",
+         "displayName" : "Default configuration for UPS",
+         "inherits" : [
+            "default",
+            "extra_for_UPS"
+         ],
+         "name" : "for_UPS"
+      }
+   ],
+   "version" : 3
+}

icaruscode/Overlays/CMakeLists.txt

@@ -44,13 +44,12 @@ art_make_library(
 	lardata::ArtDataHelper
         ${FHICLCPP}
         cetlib_except::cetlib_except
-	WireCellGen
-	WireCellUtil
-	WireCellAux
-	WireCellIface
-	WireCellPgraph
-	WireCellRoot
-	jsoncpp
+	WireCell::Gen
+	WireCell::Util
+	WireCell::Aux
+	WireCell::Iface
+	WireCell::Pgraph
+        WireCell::Root
 	dl
 )
 

test/Geometry/CMakeLists.txt

@@ -1,6 +1,12 @@
 
 # geometry test on ICARUS 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} ${icarusalg_BINARY_DIR}/job)
+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.
 cet_test(geometry_icarus HANDBUILT