Commit d04e280b authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

GeoModel: cmake cleanup

Cleanup of cmake configuration of GeoModel related packages. Tidy
external and links dependencies. Remove `atlas_depends_on_subdirs`.
parent 9154a0ed
################################################################################
# Package: GeoAdaptors
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeoAdaptors )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloDetDescr
Calorimeter/CaloIdentifier
Calorimeter/CaloSimEvent
Control/StoreGate
DetectorDescription/Identifier
DetectorDescription/GeoPrimitives
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetDetDescr/PixelReadoutGeometry
InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
InnerDetector/InDetSimEvent
LArCalorimeter/LArSimEvent
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
MuonSpectrometer/MuonIdHelpers
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
MuonSpectrometer/MuonSimEvent )
# External dependencies:
find_package( CLHEP )
......@@ -34,5 +12,4 @@ atlas_add_library( GeoAdaptors
PUBLIC_HEADERS GeoAdaptors
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier CaloSimEvent Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry InDetSimEvent LArSimEvent MuonReadoutGeometry MuonPrepRawData MuonSimEvent CaloDetDescrLib StoreGateLib SGtests MuonIdHelpersLib )
LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier CaloSimEvent GeoPrimitives Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry InDetSimEvent LArSimEvent MuonReadoutGeometry MuonPrepRawData MuonSimEvent CaloDetDescrLib StoreGateLib MuonIdHelpersLib )
################################################################################
# Package: GeoExporter
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeoExporter )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
GaudiKernel
PRIVATE
Event/EventInfo
Tools/PathResolver
DetectorDescription/GeoModel/GeoModelStandalone/GeoExporter
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/GeoModel/GeoModelUtilities
graphics/VP1/VP1Utils
)
#DetectorDescription/GeoModel/GeoModelStandalone/GeoWrite
#DetectorDescription/GeoModel/GeoModelStandalone/GeoModelDBManager
# External dependencies:
find_package( Qt5 COMPONENTS Sql Gui PrintSupport )
find_package( Eigen ) # is it really needed here?
FIND_PACKAGE( Boost ) # is it really needed here?
find_package( CLHEP )
#find_package( GeoModelCore REQUIRED )
find_package( Boost )
find_package( GeoModelIO REQUIRED )
#message( "GEOMODELIO_LIBRARIES: ${GEOMODELIO_LIBRARIES}")
# Component(s) in the package:
atlas_add_library( GeoExporter
src/*.cxx
GeoExporter/*.h
PUBLIC_HEADERS GeoExporter
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES Qt5::Sql
${GEOMODELIO_LIBRARIES}
GeoModelUtilities
VP1Utils
${CLHEP_LIBRARIES}
${EIGEN_LIBRARIES}
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES Qt5::Sql ${GEOMODELIO_LIBRARIES} GeoModelUtilities VP1Base VP1Utils
)
#NEW SYNTAX TO BE USED SOON: GeoModelIO::GeoModelDBManager GeoModelIO::GeoModelWrite
################################################################################
# Package: GeoModelUtilities
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeoModelUtilities )
......@@ -15,8 +13,7 @@ atlas_add_library( GeoModelUtilities
src/*.cxx
PUBLIC_HEADERS GeoModelUtilities
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps SGTools GeoModelInterfaces
PRIVATE_LINK_LIBRARIES GaudiKernel )
LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeoModelInterfaces RDBAccessSvcLib )
atlas_add_test( GeoGetIds_test
SOURCES test/GeoGetIds_test.cxx
......@@ -28,12 +25,8 @@ atlas_add_test( GeoVisitVolumes_test
endif()
if(BUILDVP1LIGHT)
# Declare the package's dependencies:
#atlas_depends_on_subdirs( PUBLIC
# DetectorDescription/GeoModel/GeoModelKernel )
# External dependencies:
find_package( CLHEP )
find_package( GeoModelCore )
find_package( Eigen )
......@@ -53,7 +46,7 @@ atlas_add_library( GeoModelUtilities
${SOURCES}
PUBLIC_HEADERS GeoModelUtilities
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} )
LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} )
endif()
# Code in this file makes heavy use of eigen and runs orders of magnitude
......
################################################################################
# Package: GeoModelXml
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeoModelXml )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
AtlasPolicy
PRIVATE
DetectorDescription/GeoModelInterfaces
Control/StoreGate
GaudiKernel )
# External dependencies:
find_package( XercesC )
find_package( Eigen )
......@@ -25,7 +15,7 @@ atlas_add_library( GeoModelXml
src/*.cxx
PUBLIC_HEADERS GeoModelXml
INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS} ${GEOMODELTOOLS_INCLUDE_DIRS}
LINK_LIBRARIES ${XERCESC_LIBRARIES} ${EIGEN_LIBRARIES} ${ZLIB_LIBRARIES} ${GEOMODELCORE_LIBRARIES} ${GEOMODELTOOLS_LIBRARIES} StoreGateLib
PRIVATE_LINK_LIBRARIES GaudiKernel )
LINK_LIBRARIES ${XERCESC_LIBRARIES} ${ZLIB_LIBRARIES} ${GEOMODELCORE_LIBRARIES} ${GEOMODELTOOLS_LIBRARIES}
PRIVATE_LINK_LIBRARIES ${EIGEN_LIBRARIES} GaudiKernel GeoModelInterfaces StoreGateLib )
atlas_install_runtime( data/*.dtd )
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# $Id: CMakeLists.txt 744450 2016-05-03 12:38:18Z krasznaa $
################################################################################
# Package: GeoPrimitives
################################################################################
# Declare the package name:
atlas_subdir( GeoPrimitives )
# Declare the package's dependencies:
atlas_depends_on_subdirs(
PUBLIC
Control/CxxUtils
Event/EventPrimitives )
# External dependencies:
find_package( CLHEP QUIET )
find_package( Eigen )
......
################################################################################
# Package: GeometryDBSvc
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeometryDBSvc )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Database/RDBAccessSvc
GaudiKernel
PRIVATE
Control/AthenaBaseComps )
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
# Component(s) in the package:
atlas_add_library( GeometryDBSvcLib
INTERFACE
PUBLIC_HEADERS GeometryDBSvc
LINK_LIBRARIES RDBAccessSvcLib GaudiKernel )
# Component(s) in the package:
atlas_add_component( GeometryDBSvc
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} GaudiKernel AthenaBaseComps GeometryDBSvcLib )
LINK_LIBRARIES AthenaBaseComps CxxUtils GeometryDBSvcLib )
Markdown is supported
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