AnalysisCommon: cmake cleanup of PMG packages

PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/GammaORTools/CMakeLists.txt

-################################################################################
-# Package: GammaORTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( GammaORTools )
 
-# Extra dependencies, based on the environment:
-if( XAOD_STANDALONE )
-    set( extra_deps Control/xAODRootAccess )
-else()
-   set( extra_deps Control/AthenaBaseComps GaudiKernel PhysicsAnalysis/POOLRootAccess)
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODTruth
-   Event/xAOD/xAODEventInfo
-   PhysicsAnalysis/Interfaces/PMGAnalysisInterfaces
-   PRIVATE
-   ${extra_deps} 
-   )
-
+# External dependencies:
+find_package( Boost )
 
 # Libraries in the package:
 atlas_add_library( GammaORToolsLib
    GammaORTools/*.h Root/*.cxx
    PUBLIC_HEADERS GammaORTools
-   INCLUDE_DIRS 
-   LINK_LIBRARIES AsgTools xAODTruth xAODEventInfo MCTruthClassifierLib )
+   INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+   LINK_LIBRARIES ${Boost_LIBRARIES} AsgTools xAODTruth MCTruthClassifierLib )
 
 if( NOT XAOD_STANDALONE )
   atlas_add_component( GammaORTools
     src/components/*.cxx
-    LINK_LIBRARIES AthenaBaseComps GaudiKernel GammaORToolsLib)
+    LINK_LIBRARIES GammaORToolsLib)
 endif()
 
 atlas_add_dictionary( GammaORToolsDict

PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/CMakeLists.txt

@@ -3,19 +3,6 @@
 # Declare the package name:
 atlas_subdir( HFORTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODJet
-   Event/xAOD/xAODTruth
-   Event/xAOD/xAODEventInfo
-   PhysicsAnalysis/Interfaces/PMGAnalysisInterfaces
-   PRIVATE
-   Event/xAOD/xAODBase
-   Tools/PathResolver
-)
-
 # External dependencies:
 find_package( Boost )
 find_package( ROOT COMPONENTS Core RIO )
@@ -24,7 +11,7 @@ find_package( ROOT COMPONENTS Core RIO )
 atlas_add_library( HFORToolsLib
    HFORTools/*.h Root/*.cxx
    PUBLIC_HEADERS HFORTools
-   LINK_LIBRARIES AsgTools xAODTruth xAODJet
+   LINK_LIBRARIES AsgTools PMGAnalysisInterfacesLib xAODTruth xAODJet
    PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
    PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} PathResolver xAODBase xAODEventInfo
    xAODRootAccess )
@@ -32,7 +19,7 @@ atlas_add_library( HFORToolsLib
 if( NOT XAOD_STANDALONE )
    atlas_add_component( HFORTools
       src/*.h src/*.cxx src/components/*.cxx
-      LINK_LIBRARIES GaudiKernel AthenaBaseComps xAODEventInfo HFORToolsLib )
+      LINK_LIBRARIES GaudiKernel AthenaBaseComps xAODEventInfo PMGAnalysisInterfacesLib HFORToolsLib )
 endif()
 
 atlas_add_dictionary( HFORToolsDict
@@ -52,7 +39,7 @@ endif()
 # Test(s) in the package:
 atlas_add_test( ut_HFORTools_test
    SOURCES test/ut_HFORTools_test.cxx
-   LINK_LIBRARIES AsgTools xAODEventInfo HFORToolsLib ${test_lib} )
+   LINK_LIBRARIES AsgTools PMGAnalysisInterfacesLib xAODEventInfo HFORToolsLib ${test_lib} )
 
 # Install files from the package:
 atlas_install_data( data/*.cfg )

PhysicsAnalysis/AnalysisCommon/PMGTools/CMakeLists.txt

-#################################################################################
-# Package: PMGTools
-#################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( PMGTools )
 
-# Extra dependencies based on the build environment:
-set( extra_private_deps )
-# ... for AnalysisBase
-if( XAOD_STANDALONE )
-   set( extra_private_deps Control/xAODRootAccess )
-# ... for AthAnalysisBase/Athena
-else()
-   set( extra_private_deps Control/AthAnalysisBaseComps PhysicsAnalysis/POOLRootAccess GaudiKernel Event/EventInfo)
-endif()
-
 # Extra libraries based on the build environment:
 set( xaod_access_lib )
 set( extra_private_libs )
@@ -24,27 +12,9 @@ if( XAOD_STANDALONE )
 # ... for AthAnalysisBase (Athena calls this POOLRootAccess)
 else()
    set( xaod_access_lib POOLRootAccessLib )
-   set( extra_private_libs EventInfo )
+   set( extra_private_libs AthAnalysisBaseCompsLib EventInfo )
 endif()
 
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODTruth
-   PhysicsAnalysis/AnalysisCommon/PATCore
-   PhysicsAnalysis/AnalysisCommon/PATInterfaces
-   PhysicsAnalysis/Interfaces/PMGAnalysisInterfaces
-   PRIVATE
-   Event/FourMomUtils
-   Event/xAOD/xAODEventInfo
-   Event/xAOD/xAODJet
-   Event/xAOD/xAODMetaData
-   PhysicsAnalysis/D3PDTools/RootCoreUtils
-   Tools/PathResolver
-   ${extra_private_deps} )
-
 # External(s) used by the package:
 find_package( ROOT COMPONENTS Core Hist RIO )
 find_package( Boost )
@@ -54,13 +24,14 @@ atlas_add_library( PMGToolsLib
    PMGTools/*.h Root/*.cxx
    PUBLIC_HEADERS PMGTools
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools PATCoreLib PATInterfaces xAODTruth
-   PRIVATE_LINK_LIBRARIES FourMomUtils PathResolver RootCoreUtils xAODEventInfo xAODJet xAODMetaData ${extra_private_libs})
+   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools PATCoreLib PATInterfaces PMGAnalysisInterfacesLib xAODTruth
+   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} CxxUtils FourMomUtils PathResolver RootCoreUtils xAODBase xAODEventInfo xAODJet xAODMetaData ${extra_private_libs})
 
 if( NOT XAOD_STANDALONE )
    atlas_add_component( PMGTools
       src/components/*.cxx
-      LINK_LIBRARIES GaudiKernel PMGToolsLib )
+      LINK_LIBRARIES PMGToolsLib )
 endif()
 
 atlas_add_dictionary( PMGToolsDict
@@ -75,8 +46,8 @@ if( NOT XAOD_STANDALONE )
    atlas_add_executable( MyPMGApp
       test/MyPMGApp.cxx
       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-      LINK_LIBRARIES ${ROOT_LIBRARIES} AthAnalysisBaseCompsLib ${xaod_access_lib}
-      AsgTools xAODJet xAODTruth FourMomUtils PATInterfaces PMGToolsLib )
+      LINK_LIBRARIES ${ROOT_LIBRARIES} AsgMessagingLib AsgTools GaudiKernel PATInterfaces
+      PMGAnalysisInterfacesLib PMGToolsLib xAODJet xAODTruth ${xaod_access_lib} )
 endif()
 
 # Test(s) in the package:
@@ -91,10 +62,10 @@ if( XAOD_STANDALONE )
    atlas_add_test( ut_PMGSherpaVjetsSysTool_test
       SOURCES test/ut_PMGSherpaVjetsSysTool_test.cxx
       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-      LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools PATInterfaces PMGToolsLib ${xaod_access_lib} )
+      LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools PATInterfaces PMGAnalysisInterfacesLib PMGToolsLib ${xaod_access_lib} )
 endif()
 # ... AthAnalysis/AnalysisBase
 atlas_add_test( ut_PMGTruthWeightTool_test
    SOURCES test/ut_PMGTruthWeightTool_test.cxx
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} PMGToolsLib ${xaod_access_lib} )
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgMessagingLib AsgTools PMGAnalysisInterfacesLib PMGToolsLib xAODTruth ${xaod_access_lib} )