From 1b6ab863790d10711020e050f2b9532d03d2833d Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Sat, 7 Nov 2020 14:19:24 -0500
Subject: [PATCH] LArMonitoring: cmake fixes
Don't build an object into more than one library.
---
LArCalorimeter/LArMonitoring/CMakeLists.txt | 4 ++--
.../LArMonitoring/src/{ => StrHelper}/LArStrHelper.cxx | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename LArCalorimeter/LArMonitoring/src/{ => StrHelper}/LArStrHelper.cxx (100%)
diff --git a/LArCalorimeter/LArMonitoring/CMakeLists.txt b/LArCalorimeter/LArMonitoring/CMakeLists.txt
index 2a72080d09e..afab0c9e682 100644
--- a/LArCalorimeter/LArMonitoring/CMakeLists.txt
+++ b/LArCalorimeter/LArMonitoring/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
atlas_add_library( LArStrHelper
- src/LArStrHelper.cxx LArMonitoring/LArStrHelper.h
+ src/StrHelper/LArStrHelper.cxx LArMonitoring/LArStrHelper.h
PUBLIC_HEADERS LArMonitoring
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES})
@@ -20,7 +20,7 @@ atlas_add_component( LArMonitoring
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CaloDetDescrLib CaloGeoHelpers CaloIdentifier AthenaMonitoringLib SGtests Identifier LArIdentifier LArRawEvent LArRecConditions LArCablingLib TrigDecisionToolLib CaloConditions AthenaKernel AthenaPoolUtilities xAODEventInfo LArCOOLConditions LArRawConditions LArRecEvent )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CaloDetDescrLib CaloGeoHelpers CaloIdentifier AthenaMonitoringLib SGtests Identifier LArIdentifier LArRawEvent LArRecConditions LArCablingLib TrigDecisionToolLib CaloConditions AthenaKernel AthenaPoolUtilities xAODEventInfo LArCOOLConditions LArRawConditions LArRecEvent LArStrHelper )
atlas_add_dictionary( LArStrHelperDict
LArMonitoring/LArStrHelperDict.h
diff --git a/LArCalorimeter/LArMonitoring/src/LArStrHelper.cxx b/LArCalorimeter/LArMonitoring/src/StrHelper/LArStrHelper.cxx
similarity index 100%
rename from LArCalorimeter/LArMonitoring/src/LArStrHelper.cxx
rename to LArCalorimeter/LArMonitoring/src/StrHelper/LArStrHelper.cxx
--
GitLab