Fix linking with FileCatalog lib in CollectionBase/CMakeLists.txt

Database/APR/CollectionBase/CMakeLists.txt

@@ -25,20 +25,18 @@ atlas_add_library( CollectionBase
                    PUBLIC_HEADERS CollectionBase
                    INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} 
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools
-                   POOLCore PersistencySvc PersistentDataModel
-                   GaudiKernel FileCatalog )
+                   LINK_LIBRARIES ${Boost_LIBRARIES}
+                   ${CORAL_LIBRARIES} FileCatalog POOLCore GaudiKernel
+                   PersistencySvc PersistentDataModel 
+                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools )
 
 atlas_add_dictionary( CollectionDict
                       CollectionBase/CollectionDict.h
                       CollectionBase/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} TestTools POOLCore PersistencySvc PersistentDataModel GaudiKernel CollectionBase )
+                      LINK_LIBRARIES CollectionBase )
 
 atlas_add_test( Factory_test
-                SOURCES
-                test/Factory_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} TestTools POOLCore PersistencySvc PersistentDataModel GaudiKernel CollectionBase )
+                SOURCES test/Factory_test.cxx
+                LINK_LIBRARIES CollectionBase )
 

Database/APR/FileCatalog/CMakeLists.txt

@@ -27,57 +27,46 @@ atlas_add_library( FileCatalog
 atlas_add_test( URIParser_test
                 SOURCES
                 test/URIParser_test.cxx
-                INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                LINK_LIBRARIES ${CORAL_LIBRARIES} POOLCore TestTools GaudiKernel FileCatalog )
+                LINK_LIBRARIES FileCatalog )
 
 atlas_add_executable( FCaddReplica
                       utilities/FCaddReplica.cpp
-                      INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${CORAL_LIBRARIES} POOLCore TestTools GaudiKernel FileCatalog )
+                      LINK_LIBRARIES FileCatalog )
 
 atlas_add_executable( FCdeleteEntry
                       utilities/FCdeleteEntry.cpp
-                      INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${CORAL_LIBRARIES} POOLCore TestTools GaudiKernel FileCatalog )
+                      LINK_LIBRARIES FileCatalog )
 
 # not supported witgh GFC
 #atlas_add_executable( FCdeleteLFN
 #                      utilities/FCdeleteLFN.cpp
-#                      INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-#                      LINK_LIBRARIES ${CORAL_LIBRARIES} POOLCore TestTools GaudiKernel FileCatalog )
+#                      LINK_LIBRARIES FileCatalog )
 
 atlas_add_executable( FCdeletePFN
                       utilities/FCdeletePFN.cpp
-                      INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${CORAL_LIBRARIES} POOLCore TestTools GaudiKernel FileCatalog )
+                      LINK_LIBRARIES FileCatalog )
 
 atlas_add_executable( FClistGUID
                       utilities/FClistGUID.cpp
-                      INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${CORAL_LIBRARIES} POOLCore TestTools GaudiKernel FileCatalog )
+                      LINK_LIBRARIES FileCatalog )
 
 atlas_add_executable( FClistLFN
                       utilities/FClistLFN.cpp
-                      INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${CORAL_LIBRARIES} POOLCore TestTools GaudiKernel FileCatalog )
+                      LINK_LIBRARIES FileCatalog )
 
 atlas_add_executable( FClistPFN
                       utilities/FClistPFN.cpp
-                      INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${CORAL_LIBRARIES} POOLCore TestTools GaudiKernel FileCatalog )
+                      LINK_LIBRARIES FileCatalog )
 
 atlas_add_executable( FCregisterLFN
                       utilities/FCregisterLFN.cpp
-                      INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${CORAL_LIBRARIES} POOLCore TestTools GaudiKernel FileCatalog )
+                      LINK_LIBRARIES FileCatalog )
 
 atlas_add_executable( FCregisterPFN
                       utilities/FCregisterPFN.cpp
-                      INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${CORAL_LIBRARIES} POOLCore TestTools GaudiKernel FileCatalog )
+                      LINK_LIBRARIES FileCatalog )
 
 atlas_add_executable( FCrenamePFN
                       utilities/FCrenamePFN.cpp
-                      INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} 
-                      LINK_LIBRARIES ${CORAL_LIBRARIES} POOLCore TestTools GaudiKernel FileCatalog )
+                      LINK_LIBRARIES FileCatalog )