diff --git a/CMakeLists.txt b/CMakeLists.txt index 118eb4d99446df54746f814fa82db313a184bc71..56d953333fcf6b9a95348f605fc84016ad059d84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,59 +35,58 @@ if(DEFINED GAUDI_CXX_STANDARD) endif() # -- Subdirectories -lhcb_add_subdirectories( - MyOnline - Online/dim - Online/OnlineBase - Online/OnlineKernel - Online/Camera - Online/Checkpointing - Online/CondDBServer - Online/UPI - Online/Parsers - Online/Controller - Online/ControllerTests - Online/OnlineHistDB - Online/Trending - Online/DailyReport - Online/GauchoBase - Online/HTTP - Online/ROMon - Online/RPC - Online/RPCServer - Online/GauchoServer - Online/sqldb - Online/Storage - Online/Tell1Data - Online/PCIE40Data - Online/Dataflow - Online/DataflowExample - Online/Gaucho - Online/DefHLTUtils -# Online/EventBuilding - Online/EventData - Online/FarmConfig - Online/GaudiOnline - Online/GauchoAppl - Online/RawBankSizes - Online/GaudiOnlineTests - Online/GaudiRootCnvTests - Online/GaudiUPI - Online/HistDBPython - Online/IPMI - Online/MBMDump - Online/OnlineAlign - Online/OMAlib - Online/PcSrv - Online/PyDIM - Online/ROLogger - Online/RunDBAPI - Online/smixx - Online/SmiController - Online/Presenter - Online/PresenterDoc - Online/TestBeam -) +# -- Subdirectories +add_subdirectory(MyOnline) +add_subdirectory(Online/dim) +add_subdirectory(Online/OnlineBase) +add_subdirectory(Online/OnlineKernel) +add_subdirectory(Online/Camera) +add_subdirectory(Online/Checkpointing) +add_subdirectory(Online/CondDBServer) +add_subdirectory(Online/UPI) +add_subdirectory(Online/Parsers) +add_subdirectory(Online/Controller) +add_subdirectory(Online/ControllerTests) +add_subdirectory(Online/OnlineHistDB) +add_subdirectory(Online/Trending) +add_subdirectory(Online/DailyReport) +add_subdirectory(Online/GauchoBase) +add_subdirectory(Online/HTTP) +add_subdirectory(Online/ROMon) +add_subdirectory(Online/RPC) +add_subdirectory(Online/RPCServer) +add_subdirectory(Online/GauchoServer) +add_subdirectory(Online/sqldb) +add_subdirectory(Online/Storage) +add_subdirectory(Online/Tell1Data) +add_subdirectory(Online/PCIE40Data) +add_subdirectory(Online/Dataflow) +add_subdirectory(Online/DataflowExample) +add_subdirectory(Online/Gaucho) +add_subdirectory(Online/DefHLTUtils) +## add_subdirectory(Online/EventBuilding) +add_subdirectory(Online/EventData) +add_subdirectory(Online/FarmConfig) +add_subdirectory(Online/GaudiOnline) +add_subdirectory(Online/GauchoAppl) +### add_subdirectory(Online/RawBankSizes) +add_subdirectory(Online/GaudiOnlineTests) +add_subdirectory(Online/GaudiRootCnvTests) +add_subdirectory(Online/GaudiUPI) +add_subdirectory(Online/HistDBPython) +add_subdirectory(Online/IPMI) +add_subdirectory(Online/MBMDump) +add_subdirectory(Online/OnlineAlign) +add_subdirectory(Online/OMAlib) +add_subdirectory(Online/PcSrv) +add_subdirectory(Online/PyDIM) +add_subdirectory(Online/ROLogger) +add_subdirectory(Online/RunDBAPI) +add_subdirectory(Online/smixx) +add_subdirectory(Online/SmiController) +add_subdirectory(Online/Presenter) +add_subdirectory(Online/PresenterDoc) +add_subdirectory(Online/TestBeam) gaudi_install(CMAKE # helpers to find external projects @@ -95,5 +94,5 @@ gaudi_install(CMAKE cmake/PCIE40.cmake cmake/rdkafka.cmake ) -set(LHCB_UNUSED_SOURCE_MESSAGE_TYPE IGNORE) -lhcb_finalize_configuration() +##set(LHCB_UNUSED_SOURCE_MESSAGE_TYPE IGNORE) +##lhcb_finalize_configuration() diff --git a/Online/GaudiOnline/CMakeLists.txt b/Online/GaudiOnline/CMakeLists.txt index de597071036c989b6184b0bf4ce8b4f7f3989c04..3e7977ea74e291a4df0a4a303a20ddcffd93cb5d 100755 --- a/Online/GaudiOnline/CMakeLists.txt +++ b/Online/GaudiOnline/CMakeLists.txt @@ -34,11 +34,11 @@ target_compile_definitions(GaudiOnline PRIVATE MessageSvc=OnlineMessageSvc) gaudi_add_module(GaudiOnlineComp SOURCES - #components/AlgFlowManager.cpp - #components/CFNodePropertiesParse.cpp + components/AlgFlowManager.cpp + components/CFNodePropertiesParse.cpp components/Components.cpp components/Configuration.cpp - #components/ControlFlowNode.cpp + components/ControlFlowNode.cpp components/EventProcessor.cpp components/FlowManager.cpp components/IOService.cpp @@ -53,7 +53,7 @@ gaudi_add_module(GaudiOnlineComp components/TransitionSleepSvc.cpp LINK - ## LHCb::HltInterfaces + LHCb::HltInterfaces cppgsl::cppgsl Gaudi::GaudiAlgLib Gaudi::GaudiKernel diff --git a/Online/GaudiOnline/components/ISchedulerConfiguration.h b/Online/GaudiOnline/components/ISchedulerConfiguration.h index c5bd98a563a91fde333abe10e20830b8b57db329..b50c87bf61cd72795d64f32cfc8f7a48faa3fe10 100644 --- a/Online/GaudiOnline/components/ISchedulerConfiguration.h +++ b/Online/GaudiOnline/components/ISchedulerConfiguration.h @@ -10,7 +10,7 @@ \*****************************************************************************/ #pragma once #include "GaudiKernel/INamedInterface.h" -//#include "Kernel/STLExtensions.h" +#include "Kernel/STLExtensions.h" #include <gsl/span> #include <any> #include <cassert> @@ -19,7 +19,7 @@ namespace LHCb { using gsl::span; - using gsl::make_span; + //using gsl::make_span; } /** @class ISchedulerConfiguration ISchedulerConfiguration.h diff --git a/Online/GaudiOnlineTests/CMakeLists.txt b/Online/GaudiOnlineTests/CMakeLists.txt index 2e7ef51f85f14a52f384f29a077ccee869a67b65..7b0ce684c3431e8383981dab6b78eecbecc49bad 100644 --- a/Online/GaudiOnlineTests/CMakeLists.txt +++ b/Online/GaudiOnlineTests/CMakeLists.txt @@ -100,7 +100,7 @@ gaudi_add_tests(QMTest) gaudi_install(SCRIPTS) -lhcb_env(SET GAUDIONLINE_OPTS "${CMAKE_CURRENT_SOURCE_DIR}/options") +online_env(SET GAUDIONLINE_OPTS "${CMAKE_CURRENT_SOURCE_DIR}/options") # Tests need to be executed sequentially (or complete # prerequisites need to be defined, but that would have a similar result). diff --git a/cmake/OnlineDependencies.cmake b/cmake/OnlineDependencies.cmake index 423f93fbd0386bca812383f04a9de01abbd01700..d60e8eba8e4348ec0dca7e3ed9882aeb55a854de 100644 --- a/cmake/OnlineDependencies.cmake +++ b/cmake/OnlineDependencies.cmake @@ -13,6 +13,7 @@ endif() # -- Public dependencies lhcb_find_package(Gaudi REQUIRED) +lhcb_find_package(LHCb REQUIRED) find_package(Threads REQUIRED) find_package(ROOT 6.20 REQUIRED Core Gpad Gui Net Graf Hist RIO Tree MathCore Rint)