Merge branch 'cmake.xAODJetCnv-20200521' into 'master'

xAODJetCnv+xAODTrigCaloCnv+xAODTrigMuonCnv: cmake fixes

See merge request atlas/athena!33088

Event/xAOD/xAODJetCnv/CMakeLists.txt

@@ -17,14 +17,20 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/StoreGate
                           Reconstruction/Jet/JetEvent )
 
+atlas_add_library( xAODJetCnvLib
+                   xAODJetCnv/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS xAODJetCnv
+                   LINK_LIBRARIES GaudiKernel xAODJet xAODBase AthLinks )
+
+
 # Component(s) in the package:
 atlas_add_component( xAODJetCnv
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthLinks xAODBase xAODJet GaudiKernel AthenaBaseComps AthenaKernel StoreGateLib SGtests JetEvent )
+                     LINK_LIBRARIES xAODJetCnvLib xAODJet GaudiKernel AthenaBaseComps AthenaKernel StoreGateLib SGtests JetEvent )
 
 # Install files from the package:
-atlas_install_headers( xAODJetCnv )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 

Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt

@@ -14,14 +14,20 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
                           Trigger/TrigEvent/TrigCaloEvent )
 
+atlas_add_library( xAODTrigCaloCnvLib
+                   xAODTrigCaloCnv/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS xAODTrigCaloCnv
+                   LINK_LIBRARIES GaudiKernel xAODTrigCalo )
+
+
 # Component(s) in the package:
 atlas_add_component( xAODTrigCaloCnv
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES xAODTrigCalo GaudiKernel AthenaBaseComps AthenaKernel TrigCaloEvent )
+                     LINK_LIBRARIES xAODTrigCaloCnvLib xAODTrigCalo GaudiKernel AthenaBaseComps AthenaKernel TrigCaloEvent )
 
 # Install files from the package:
-atlas_install_headers( xAODTrigCaloCnv )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 

Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt

@@ -18,14 +18,20 @@ atlas_depends_on_subdirs( PUBLIC
                           Event/FourMomUtils
                           Trigger/TrigEvent/TrigMuonEvent )
 
+atlas_add_library( xAODTrigMuonCnvLib
+                   xAODTringMuonCnv/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS xAODTrigMuonCnv
+                   LINK_LIBRARIES GaudiKernel xAODTrigMuon xAODMuon xAODTracking )
+
+
 # Component(s) in the package:
 atlas_add_component( xAODTrigMuonCnv
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES xAODMuon xAODTracking xAODTrigMuon GaudiKernel AthenaBaseComps AthenaKernel AthLinks FourMomUtils TrigMuonEvent )
+                     LINK_LIBRARIES xAODTrigMuonCnvLib xAODMuon xAODTracking xAODTrigMuon GaudiKernel AthenaBaseComps AthenaKernel AthLinks FourMomUtils TrigMuonEvent )
 
 # Install files from the package:
-atlas_install_headers( xAODTrigMuonCnv )
 atlas_install_python_modules( python/xAODTrigMuonCnvConfig.py python/xAODTrigMuonCnvConfigDb.py )
 atlas_install_joboptions( share/addEFMuonxAODCnv_jobOptions.py share/runEFMuonAODCnvAlg_topOptions.py )