Merge branch 'cmake.InDetGeoModelUtils-20200414' into 'master'

InDetGeoModelUtils+BLM_GeoModel+BCM_GeoModel+LUCID_GeoModel+AFP_GeoModel: cmake fixes

See merge request !32019

ForwardDetectors/AFP/AFP_GeoModel/CMakeLists.txt

@@ -29,7 +29,7 @@ atlas_add_library( AFP_GeoModelLib
                    PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
                    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
                    LINK_LIBRARIES AthenaKernel ${GEOMODELCORE_LIBRARIES} GeoModelUtilities AFP_Geometry StoreGateLib SGtests
-                   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaPoolUtilities GaudiKernel )
+                   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaPoolUtilities GaudiKernel GeoPrimitives )
 
 atlas_add_component( AFP_GeoModel
                      src/components/*.cxx

ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt

@@ -28,7 +28,7 @@ atlas_add_library( LUCID_GeoModelLib
                    PUBLIC_HEADERS LUCID_GeoModel
                    PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
                    LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoModelUtilities GaudiKernel StoreGateLib SGtests
-                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel SGTools )
+                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel SGTools RDBAccessSvcLib )
 
 atlas_add_component( LUCID_GeoModel
                      src/components/*.cxx

InnerDetector/InDetDetDescr/BCM_GeoModel/CMakeLists.txt

@@ -26,7 +26,7 @@ atlas_add_component( BCM_GeoModel
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeoModelUtilities )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeoModelUtilities RDBAccessSvcLib )
 
 # Install files from the package:
 atlas_install_headers( BCM_GeoModel )

InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt

@@ -25,7 +25,8 @@ atlas_add_component( BLM_GeoModel
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeoModelUtilities )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeoModelUtilities
+                     PRIVATE_LINK_LIBRARIES RDBAccessSvcLib )
 
 # Install files from the package:
 atlas_install_headers( BLM_GeoModel )

InnerDetector/InDetDetDescr/InDetGeoModelUtils/CMakeLists.txt

@@ -29,6 +29,6 @@ atlas_add_library( InDetGeoModelUtils
                    PUBLIC_HEADERS InDetGeoModelUtils
                    INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GaudiKernel StoreGateLib SGtests
-                   PRIVATE_LINK_LIBRARIES GeoModelUtilities )
+                   LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GaudiKernel StoreGateLib SGtests RDBAccessSvcLib GeoPrimitives
+                   PRIVATE_LINK_LIBRARIES GeoModelUtilities GeometryDBSvcLib )