Merge branch 'cmake.MuonDigToolInterfaces-20200501' into 'master'

MuonDigToolInterfaces+MuonRegionSelector+TrackRecord: cmake fixes

See merge request !32526

MuonSpectrometer/MuonDetDescr/MuonRegionSelector/CMakeLists.txt

@@ -25,6 +25,12 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( CLHEP )
 find_package( Eigen )
 
+atlas_add_library( MuonRegionSelectorLib
+                   MuonRegionSelector/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS MuonRegionSelector
+                   LINK_LIBRARIES RegSelLUT AthenaBaseComps GaudiKernel GeoPrimitives )
+
 # Component(s) in the package:
 atlas_add_component( MuonRegionSelector
                      src/*.cxx
@@ -36,9 +42,8 @@ atlas_add_component( MuonRegionSelector
 		     MuonMDT_CablingLib MuonTGC_CablingLib RPCcablingInterfaceLib 
 		     MuonReadoutGeometry
 
-	             MuonAGDDDescription )
+	             MuonAGDDDescription MuonRegionSelectorLib )
 
 # Install files from the package:
-atlas_install_headers( MuonRegionSelector )
 atlas_install_joboptions( share/*.py )
 

MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces/CMakeLists.txt

@@ -9,6 +9,8 @@ atlas_subdir( MuonDigToolInterfaces )
 atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel )
 
-# Install files from the package:
-atlas_install_headers( MuonDigToolInterfaces )
-
+atlas_add_library( MuonDigToolInterfacesLib
+                   MuonDigToolInterfaces/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS MuonDigToolInterfaces
+                   LINK_LIBRARIES GaudiKernel )

Simulation/G4Sim/TrackRecord/CMakeLists.txt

@@ -16,13 +16,17 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
+atlas_add_library( TrackRecordLib
+                   TrackRecord/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS TrackRecord
+                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                   LINK_LIBRARIES HitManagement AthenaKernel ${CLHEP_LIBRARIES} )
+
 # Component(s) in the package:
 atlas_add_dictionary( TrackRecordDict
                       TrackRecord/TrackRecordDict.h
                       TrackRecord/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel HitManagement )
-
-# Install files from the package:
-atlas_install_headers( TrackRecord )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel HitManagement TrackRecordLib )