Skip to content

Commit

Permalink
Merge branch 'develop' into eflumerf/MergeCfgMgrModCfg
Browse files Browse the repository at this point in the history
  • Loading branch information
John Freeman committed Feb 12, 2025
2 parents dde7726 + c2759b6 commit ce40429
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ find_package(datahandlinglibs REQUIRED)
find_package(fdreadoutlibs REQUIRED)
find_package(felix REQUIRED)
find_package(opmonlib REQUIRED)
find_package(utilities REQUIRED)
find_package(folly)


##############################################################################
# Dependency sets
set(DUNEDAQ_DEPENDENCIES appfwk::appfwk datahandlinglibs::datahandlinglibs fdreadoutlibs::fdreadoutlibs appmodel::appmodel confmodel::confmodel)
set(DUNEDAQ_DEPENDENCIES appfwk::appfwk datahandlinglibs::datahandlinglibs fdreadoutlibs::fdreadoutlibs appmodel::appmodel confmodel::confmodel utilities::utilities)

# Provide override functionality for FELIX dependencies
option(WITH_FELIX_AS_PACKAGE "FELIX externals as a dunedaq package" ON)
Expand Down
1 change: 1 addition & 0 deletions cmake/flxlibsConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ find_dependency(datahandlinglibs)
find_dependency(fdreadoutlibs)
find_dependency(felix)
find_dependency(opmonlib)
find_dependency(utilities)
find_dependency(folly)

if (EXISTS ${CMAKE_SOURCE_DIR}/@PROJECT_NAME@)
Expand Down

0 comments on commit ce40429

Please sign in to comment.