Skip to content
Snippets Groups Projects
Commit 7ad0dafc authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'cmake_trigger3' into 'master' 

TrigDataAccess: cmake cleanup

See merge request atlas/athena!33741
parents 0c0ced59 a7d13fa1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 110 deletions
Trigger/TrigDataAccess/TrigDataAccessMonitoring/CMakeLists.txt
+ 10
− 25
View file @ 7ad0dafc
################################################################################
# Package: TrigDataAccessMonitoring
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigDataAccessMonitoring )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
Control/AthContainers
Event/ByteStreamCnvSvcBase
Event/ByteStreamData
GaudiKernel
PRIVATE
AtlasTest/TestTools
Control/StoreGate )
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( ROOT COMPONENTS Hist )
find_package( tdaq-common )
# Component(s) in the package:
......@@ -26,21 +13,19 @@ atlas_add_library( TrigDataAccessMonitoringLib
PUBLIC_HEADERS TrigDataAccessMonitoring
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthContainers ByteStreamData GaudiKernel ByteStreamCnvSvcBaseLib ByteStreamData_test StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools )
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthContainers AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamData GaudiKernel
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} StoreGateLib )
atlas_add_component( TrigDataAccessMonitoring
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthContainers ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel TestTools StoreGateLib SGtests TrigDataAccessMonitoringLib )
LINK_LIBRARIES TrigDataAccessMonitoringLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
# Tests in the package:
atlas_add_test( Methods_test
SOURCES
test/Methods_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthContainers ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel TestTools StoreGateLib SGtests TrigDataAccessMonitoringLib
LINK_LIBRARIES TrigDataAccessMonitoringLib
POST_EXEC_SCRIPT nopost.sh )
# Install files from the package:
atlas_install_joboptions( share/*.py )
Trigger/TrigDataAccess/TrigROBDataProviderSvc/CMakeLists.txt
+ 5
− 21
View file @ 7ad0dafc
################################################################################
# Package: TrigROBDataProviderSvc
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigROBDataProviderSvc )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Event/ByteStreamData
GaudiKernel
Trigger/TrigEvent/TrigSteeringEvent
PRIVATE
Control/AthenaMonitoring
Control/CxxUtils
Control/StoreGate
Event/ByteStreamCnvSvcBase
Trigger/TrigDataAccess/TrigDataAccessMonitoring
Trigger/TrigMonitoring/TrigMonitorBase )
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( ROOT COMPONENTS Hist )
find_package( tdaq-common )
# Component(s) in the package:
......@@ -28,13 +13,12 @@ atlas_add_library( TrigROBDataProviderSvcLib
PUBLIC_HEADERS TrigROBDataProviderSvc
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamData GaudiKernel ByteStreamData_test StoreGateLib SGtests ByteStreamCnvSvcBaseLib TrigDataAccessMonitoringLib TrigMonitorBaseLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CxxUtils )
LINK_LIBRARIES ByteStreamCnvSvcBaseLib ByteStreamData GaudiKernel TrigDataAccessMonitoringLib TrigSteeringEvent
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaMonitoringKernelLib CxxUtils StoreGateLib )
atlas_add_component( TrigROBDataProviderSvc
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ByteStreamData ByteStreamData_test GaudiKernel CxxUtils StoreGateLib SGtests ByteStreamCnvSvcBaseLib TrigDataAccessMonitoringLib TrigMonitorBaseLib TrigROBDataProviderSvcLib )
LINK_LIBRARIES TrigROBDataProviderSvcLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
......
Trigger/TrigDataAccess/TrigSerializeCnvSvc/CMakeLists.txt
+ 4
− 23
View file @ 7ad0dafc
################################################################################
# Package: TrigSerializeCnvSvc
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigSerializeCnvSvc )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthContainers
Control/AthenaBaseComps
Control/StoreGate
GaudiKernel
PRIVATE
Control/CxxUtils
Control/AthenaKernel
Control/DataModelRoot
Database/APR/StorageSvc
Database/PersistentDataModel
Trigger/TrigDataAccess/TrigSerializeResult
Trigger/TrigDataAccess/TrigSerializeTP )
# Component(s) in the package:
atlas_add_library( TrigSerializeCnvSvcLib
src/*.cxx
PUBLIC_HEADERS TrigSerializeCnvSvc
LINK_LIBRARIES AthContainers AthenaBaseComps GaudiKernel StoreGateLib SGtests TrigSerializeResultLib TrigSerializeTPLib
PRIVATE_LINK_LIBRARIES AthenaKernel DataModelRoot StorageSvc PersistentDataModel )
LINK_LIBRARIES AthContainers AthenaBaseComps AthenaKernel CxxUtils GaudiKernel StoreGateLib
PRIVATE_LINK_LIBRARIES DataModelRoot PersistentDataModel StorageSvc TrigSerializeResultLib TrigSerializeTPLib )
atlas_add_component( TrigSerializeCnvSvc
src/components/*.cxx
LINK_LIBRARIES AthContainers AthenaBaseComps StoreGateLib SGtests GaudiKernel AthenaKernel DataModelRoot StorageSvc PersistentDataModel TrigSerializeResultLib TrigSerializeTPLib TrigSerializeCnvSvcLib )
LINK_LIBRARIES TrigSerializeCnvSvcLib )
Trigger/TrigDataAccess/TrigSerializeResult/CMakeLists.txt
+ 12
− 28
View file @ 7ad0dafc
################################################################################
# Package: TrigSerializeResult
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigSerializeResult )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
GaudiKernel
PRIVATE
AtlasTest/TestTools
Control/CxxUtils
Control/AthenaBaseComps
Control/AthenaKernel
Control/DataModelRoot
Tools/PathResolver )
# External dependencies:
find_package( ROOT COMPONENTS RIO Core Tree MathCore Hist pthread )
find_package( Boost )
# Component(s) in the package:
atlas_add_library( TrigSerializeResultLib
src/*.cxx
PUBLIC_HEADERS TrigSerializeResult
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AthenaKernel GaudiKernel
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools AthenaBaseComps AthenaKernel DataModelRoot PathResolver )
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel StoreGateLib
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CxxUtils DataModelRoot PathResolver )
atlas_add_component( TrigSerializeResult
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel GaudiKernel TestTools AthenaBaseComps AthenaKernel DataModelRoot PathResolver TrigSerializeResultLib )
LINK_LIBRARIES TrigSerializeResultLib )
atlas_add_dictionary( TrigSerializeResultDict
TrigSerializeResult/TrigSerializeResultDict.h
TrigSerializeResult/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel GaudiKernel TestTools AthenaBaseComps AthenaKernel DataModelRoot PathResolver TrigSerializeResultLib )
LINK_LIBRARIES TrigSerializeResultLib )
# Install files from the package:
atlas_install_runtime( share/bs-streamerinfos*.root )
# Tests in the package:
atlas_add_test( remap_test
SOURCES
test/remap_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel GaudiKernel TestTools AthenaBaseComps AthenaKernel DataModelRoot PathResolver TrigSerializeResultLib
LINK_LIBRARIES TrigSerializeResultLib
POST_EXEC_SCRIPT nopost.sh )
# Install files from the package:
atlas_install_runtime( share/bs-streamerinfos*.root )
Trigger/TrigDataAccess/TrigSerializeTP/CMakeLists.txt
+ 3
− 13
View file @ 7ad0dafc
################################################################################
# Package: TrigSerializeTP
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigSerializeTP )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
GaudiKernel )
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( ROOT COMPONENTS Core )
# Component(s) in the package:
atlas_add_library( TrigSerializeTPLib
......@@ -24,6 +16,4 @@ atlas_add_library( TrigSerializeTPLib
atlas_add_component( TrigSerializeTP
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TrigSerializeTPLib )
LINK_LIBRARIES TrigSerializeTPLib )
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment