Merge branch 'dbglink.TrigT1CaloCondSvc-20170318' into 'master'

Fix linking of LArCellRec in dbg build See merge request !445

Merge branch 'dbglink.TrigT1CaloCondSvc-20170318' into 'master'
12bc7164 · Takashi Yamanaka · 140882ed · 650dcc13 · 12bc7164 · 12bc7164
Commit 12bc7164 authored 8 years ago by Takashi Yamanaka
--- a/LArCalorimeter/LArCellRec/CMakeLists.txt
+++ b/LArCalorimeter/LArCellRec/CMakeLists.txt
@@ -48,7 +48,7 @@ atlas_add_component( LArCellRec
                     src/*.cxx
                     src/components/*.cxx
                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} CaloConditions CaloDetDescrLib CaloEvent CaloIdentifier CaloRecLib CaloUtilsLib AthAllocators AthenaBaseComps AthenaKernel StoreGateLib SGtests AtlasDetDescr Identifier GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArSimEvent CaloTriggerToolLib AthenaPoolUtilities xAODEventInfo xAODTrigL1Calo GeneratorObjects LArRecEvent LArCablingLib TrigT1CaloCalibConditions )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} CaloConditions CaloDetDescrLib CaloEvent CaloIdentifier CaloRecLib CaloUtilsLib AthAllocators AthenaBaseComps AthenaKernel StoreGateLib SGtests AtlasDetDescr Identifier GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArSimEvent CaloTriggerToolLib AthenaPoolUtilities xAODEventInfo xAODTrigL1Calo GeneratorObjects LArRecEvent LArCablingLib TrigT1CaloCalibConditions TrigT1CaloCondSvcLib )

 # Install files from the package:
 atlas_install_headers( LArCellRec )

--- a/Trigger/TrigT1/TrigT1CaloCondSvc/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloCondSvc/CMakeLists.txt
@@ -17,10 +17,13 @@ atlas_depends_on_subdirs( PUBLIC
                          Trigger/TrigT1/TrigT1CaloCalibConditions )

 # Component(s) in the package:
+atlas_add_library( TrigT1CaloCondSvcLib
+                   src/*.cxx
+                   LINK_LIBRARIES AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel TrigT1CaloCalibConditions )
+
 atlas_add_component( TrigT1CaloCondSvc
-                     src/*.cxx
                     src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel TrigT1CaloCalibConditions )
+                     LINK_LIBRARIES AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel TrigT1CaloCalibConditions TrigT1CaloCondSvcLib )

 # Install files from the package:
 atlas_install_headers( TrigT1CaloCondSvc )