Merge branch 'cmake.TrkVertexFitterUtils-20200817' into 'master'

TrkVertexFitterUtils: cmake fixe

See merge request atlas/athena!35688

Tracking/TrkVertexFitter/TrkVertexFitterUtils/CMakeLists.txt

@@ -5,41 +5,25 @@
 # Declare the package name:
 atlas_subdir( TrkVertexFitterUtils )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Event/xAOD/xAODTracking
-                          GaudiKernel
-                          MagneticField/MagFieldConditions   # exposed by FullLinearizedTrackFactory.h
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkParametersBase
-                          Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
-                          PRIVATE
-                          AtlasTest/TestTools
-                          MagneticField/MagFieldElements
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkNeutralParameters
-                          Tracking/TrkEvent/TrkParticleBase
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkTrackLink
-                          Tracking/TrkEvent/VxVertex
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkExtrapolation/TrkExUtils 
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( CLHEP )
+
+atlas_add_library( TrkVertexFitterUtilsLib
+                   TrkVertexFitterUtils/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS TrkVertexFitterUtils
+                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                   LINK_LIBRARIES TrkVertexFitterInterfaces AthenaBaseComps xAODTracking GaudiKernel TrkParametersBase TrkParameters MagFieldConditions ${CLHEP_LIBRARIES} )
 
 # Component(s) in the package:
 atlas_add_component( TrkVertexFitterUtils
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel TrkParameters TrkParametersBase TrkVertexFitterInterfaces MagFieldConditions MagFieldElements TrkSurfaces TrkEventPrimitives TrkNeutralParameters TrkParticleBase TrkTrack VxVertex TrkExInterfaces TrkExUtils )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} MagFieldElements TrkSurfaces TrkEventPrimitives TrkNeutralParameters TrkParticleBase TrkTrack VxVertex TrkExInterfaces TrkExUtils TrkVertexFitterUtilsLib )
 
 # Install files from the package:
-atlas_install_headers( TrkVertexFitterUtils )
 atlas_install_joboptions( share/*.txt )