Skip to content
Snippets Groups Projects
Commit 9f3ebf97 authored by Attila Krasznahorkay's avatar Attila Krasznahorkay Committed by Graeme Stewart
Browse files

Now building a component library in the package with both CMT and CMake (TrkValAlgs-01-00-05)

2016-08-23 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
	* The package now builds a component library with both CMT and
	  CMake instead of a dual-use library. Since no other package
	  uses this package.
	* This was done while fixing some linking issues for the package
	  with CMake. Which was in the end traced back to an issue with
	  the TrkValInterfaces package, and not this one. :-/
	* Tagging as TrkValAlgs-01-00-05


Former-commit-id: af25c87f9e8723f812c644ace80c612bf6a48bb6
parent dbee96ac
No related branches found
No related tags found
No related merge requests found
Showing
with 34 additions and 37 deletions
# $Id: CMakeLists.txt 769538 2016-08-23 12:55:49Z krasznaa $
################################################################################
# Package: TrkValAlgs
################################################################################
......@@ -6,43 +7,40 @@
atlas_subdir( TrkValAlgs )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
GaudiKernel
Tracking/TrkEvent/TrkParameters
Tracking/TrkEvent/TrkTrack
Tracking/TrkEvent/TrkTruthData
PRIVATE
DetectorDescription/AtlasDetDescr
Generators/GeneratorObjects
Tracking/TrkDetDescr/TrkSurfaces
Tracking/TrkEvent/TrkEventUtils
Tracking/TrkEvent/TrkMaterialOnTrack
Tracking/TrkEvent/TrkParticleBase
Tracking/TrkEvent/TrkPrepRawData
Tracking/TrkEvent/TrkRIO_OnTrack
Tracking/TrkEvent/TrkSegment
Tracking/TrkEvent/TrkSpacePoint
Tracking/TrkEvent/TrkTrackSummary
Tracking/TrkEvent/VxVertex
Tracking/TrkTools/TrkToolInterfaces
Tracking/TrkValidation/TrkValEvent
Tracking/TrkValidation/TrkValInterfaces )
atlas_depends_on_subdirs(
PUBLIC
Control/AthenaBaseComps
GaudiKernel
Tracking/TrkEvent/TrkParameters
Tracking/TrkEvent/TrkTrack
Tracking/TrkEvent/TrkTruthData
PRIVATE
DetectorDescription/AtlasDetDescr
Generators/GeneratorObjects
Tracking/TrkDetDescr/TrkSurfaces
Tracking/TrkEvent/TrkEventUtils
Tracking/TrkEvent/TrkMaterialOnTrack
Tracking/TrkEvent/TrkParticleBase
Tracking/TrkEvent/TrkPrepRawData
Tracking/TrkEvent/TrkRIO_OnTrack
Tracking/TrkEvent/TrkSegment
Tracking/TrkEvent/TrkSpacePoint
Tracking/TrkEvent/TrkTrackSummary
Tracking/TrkEvent/VxVertex
Tracking/TrkTools/TrkToolInterfaces
Tracking/TrkValidation/TrkValEvent
Tracking/TrkValidation/TrkValInterfaces )
# External dependencies:
find_package( HepMC )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( ROOT COMPONENTS Core Tree )
# Component(s) in the package:
atlas_add_library( TrkValAlgsLib
src/*.cxx
PUBLIC_HEADERS TrkValAlgs
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES AthenaBaseComps GaudiKernel TrkParameters TrkTrack TrkTruthData
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} AtlasDetDescr GeneratorObjects TrkSurfaces TrkEventUtils TrkMaterialOnTrack TrkParticleBase TrkPrepRawData TrkRIO_OnTrack TrkSegment TrkSpacePoint TrkTrackSummary VxVertex TrkToolInterfaces TrkValEvent TrkValInterfaces )
atlas_add_component( TrkValAlgs
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel TrkParameters TrkTrack TrkTruthData AtlasDetDescr GeneratorObjects TrkSurfaces TrkEventUtils TrkMaterialOnTrack TrkParticleBase TrkPrepRawData TrkRIO_OnTrack TrkSegment TrkSpacePoint TrkTrackSummary VxVertex TrkToolInterfaces TrkValEvent TrkValInterfaces TrkValAlgsLib )
TrkValAlgs/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps
GaudiKernel TrkParameters TrkTrack TrkTruthData AtlasDetDescr
GeneratorObjects TrkSurfaces TrkEventUtils TrkMaterialOnTrack
TrkParticleBase TrkPrepRawData TrkRIO_OnTrack TrkSegment TrkSpacePoint
TrkTrackSummary VxVertex TrkToolInterfaces TrkValEvent TrkValInterfaces )
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -38,6 +38,5 @@ use TrkParticleBase TrkParticleBase-* Tracking/TrkEven
public
apply_pattern dual_use_library files="*.cxx"
library TrkValAlgs *.cxx components/*.cxx
apply_pattern component_library
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment