From 4007b36b750ebe101e96ab0ddaa99775bfe8e1ae Mon Sep 17 00:00:00 2001 From: John Freeman Date: Wed, 1 Dec 2021 16:08:58 -0600 Subject: [PATCH] JCF: add explicit dependence on ers and opmonlib; have find_dependency call ers in sspmodulesConfig.cmake.in --- CMakeLists.txt | 3 ++- cmake/sspmodulesConfig.cmake.in | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cba3edc..c8e7899 100644 --- 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 index 245a997..63b39bf 100644 --- 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)