Merge johnfreeman/fix_package_dependencies into develop

DUNE-DAQ · Dec 2, 2021 · ad1dd46 · ad1dd46
2 parents 18d8b30 + 4007b36
commit ad1dd46
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,15 +6,16 @@ find_package(daq-cmake REQUIRED)
 daq_setup_environment()
 
 # ers: for exceptions and normal output
-# TRACE: for low-level debugging statements
 # Boost unit_test_framework: for the unit tests
 # Boost program_options: to allow command line options with descriptions/default values
 
 find_package(appfwk REQUIRED)
 find_package(logging REQUIRED)
+find_package(ers REQUIRED)
 find_package(detdataformats REQUIRED)
 find_package(readoutlibs REQUIRED)
 find_package(fdreadoutlibs REQUIRED)
+find_package(opmonlib REQUIRED)
 
 daq_codegen(sspcardreader.jsonnet TEMPLATES Structs.hpp.j2 Nljs.hpp.j2 )
 daq_codegen( *info.jsonnet DEP_PKGS opmonlib TEMPLATES opmonlib/InfoStructs.hpp.j2 opmonlib/InfoNljs.hpp.j2 )

diff --git a/cmake/sspmodulesConfig.cmake.in b/cmake/sspmodulesConfig.cmake.in
@@ -5,6 +5,7 @@ include(CMakeFindDependencyMacro)
 
 find_dependency(appfwk)
 find_dependency(logging)
+find_dependency(ers)
 find_dependency(detdataformats)
 find_dependency(readoutlibs)
 find_dependency(fdreadoutlibs)