From 9bce01ee92003884a736497a0064dc5005bf36bb Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Wed, 24 Oct 2018 16:23:50 +0000
Subject: [PATCH] Merge branch 'nswL1Fixes' into '21.3'
Fix TrigT1NSWSimtools CMake for NSW L1 trigger
See merge request atlas/athena!15111
(cherry picked from commit 4ca2ce78a76b46a9190594d101281ccb775491ad)
cc1332bf Edit TrigT1NSWSimTools CMakeList to build components
e2c698d6 Clean comments in TrigT1NSWSimTools/CMakeLists.txt
---
.../python/iconfTool/gui/__init__.py | 0
Trigger/TrigT1/TrigT1NSW/CMakeLists.txt | 2 +-
Trigger/TrigT1/TrigT1NSWSimTools/CMakeLists.txt | 17 +++++++++++++----
3 files changed, 14 insertions(+), 5 deletions(-)
mode change 100644 => 100755 Control/AthenaConfiguration/python/iconfTool/gui/__init__.py
diff --git a/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py b/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py
old mode 100644
new mode 100755
diff --git a/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt b/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt
index ed0571b725c..c17bb468f64 100644
--- a/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt
@@ -27,7 +27,7 @@ atlas_add_component( TrigT1NSW
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${BOOST_LIBRARIES} ${TBB_LIBRARIES}
- AthenaBaseComps GaudiKernel TrigInterfacesLib TrigT1NSWSimTools AthenaMonitoringLib
+ AthenaBaseComps GaudiKernel TrigInterfacesLib TrigT1NSWSimToolsLib AthenaMonitoringLib
StoreGateLib SGtests EventInfo )
# Install files from the package:
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/CMakeLists.txt b/Trigger/TrigT1/TrigT1NSWSimTools/CMakeLists.txt
index bb28024cce2..f42fd2cc8d7 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/CMakeLists.txt
@@ -31,10 +31,9 @@ find_package( CLHEP )
find_package( Eigen )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
-# Component(s) in the package:
-atlas_add_library( TrigT1NSWSimTools
+# Library in the package
+atlas_add_library( TrigT1NSWSimToolsLib
src/*.cxx
- src/components/*.cxx
PUBLIC_HEADERS TrigT1NSWSimTools
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${BOOST_LIBRARIES} ${TBB_LIBRARIES} ${HEPMC_LIBRARIES}
@@ -42,6 +41,16 @@ atlas_add_library( TrigT1NSWSimTools
MuonDigitContainer MuonIdHelpersLib MuonSimEvent MuonSimData )
+# Component(s) in the package:
+atlas_add_component( TrigT1NSWSimTools
+ src/*.cxx
+ src/components/*.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${BOOST_LIBRARIES} ${TBB_LIBRARIES} ${HEPMC_LIBRARIES}
+ SGTools GaudiKernel AthenaBaseComps AthenaKernel AGDDKernel GeoPrimitives Identifier EventInfo MuonAGDDDescription MuonReadoutGeometry
+ MuonDigitContainer MuonIdHelpersLib MuonSimEvent MuonSimData TrigT1NSWSimToolsLib)
+
+
#loop over each cxx file in the util directory of this package
file (GLOB util_sources RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/util" "${CMAKE_CURRENT_SOURCE_DIR}/util/[a-zA-Z0-9]*.cxx")
foreach (SOURCE ${util_sources})
@@ -49,7 +58,7 @@ atlas_add_library( TrigT1NSWSimTools
string (REGEX REPLACE ".cxx$" "" FILE ${SOURCE})
atlas_add_executable (${FILE} SOURCES util/${FILE}.cxx LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${BOOST_LIBRARIES} ${TBB_LIBRARIES} ${HEPMC_LIBRARIES}
SGTools GaudiKernel AthenaBaseComps AthenaKernel AGDDKernel GeoPrimitives Identifier EventInfo MuonAGDDDescription MuonReadoutGeometry
- MuonDigitContainer MuonIdHelpersLib MuonSimEvent MuonSimData TrigT1NSWSimTools)
+ MuonDigitContainer MuonIdHelpersLib MuonSimEvent MuonSimData TrigT1NSWSimToolsLib)
endforeach (SOURCE ${util_sources})
--
GitLab