Merge branch 'rootconv2' into 'master'

RootCollection+ImplicitCollection: cmake fixes See merge request !36072

Merge branch 'rootconv2' into 'master'
RootCollection+ImplicitCollection: cmake fixes See merge request !36072
dea63a58 · Walter Lampl · 2e11542f · deaadaf9 · dea63a58 · dea63a58
Commit dea63a58 authored 4 years ago by Walter Lampl
--- a/Database/APR/ImplicitCollection/CMakeLists.txt
+++ b/Database/APR/ImplicitCollection/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_add_library( ImplicitCollection
                   src/*.cpp
                   NO_PUBLIC_HEADERS
                   PRIVATE_INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                   PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} CollectionBase POOLCore PersistencySvc PersistentDataModel StorageSvc )
+                   PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaKernel CollectionBase POOLCore PersistencySvc PersistentDataModel StorageSvc )

 # Component list generation:
 atlas_generate_componentslist( ImplicitCollection )
--- a/Database/APR/RootCollection/CMakeLists.txt
+++ b/Database/APR/RootCollection/CMakeLists.txt
@@ -20,8 +20,8 @@ atlas_add_library( RootCollection
                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                   PRIVATE_INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
                   LINK_LIBRARIES ${ROOT_LIBRARIES} RootUtilsPyROOT
-                   PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} CollectionBase
-                   GaudiKernel POOLCore PersistencySvc PersistentDataModel RootUtils )
+                   PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaKernel CollectionBase
+                   FileCatalog GaudiKernel POOLCore PersistencySvc PersistentDataModel RootUtils )

 atlas_add_library( RootCollectionComponents
                   NO_PUBLIC_HEADERS