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

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:

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})