From 4d8d5ba91d83a0859d052d875d3176da31801966 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Fri, 10 Apr 2020 16:46:26 +0200 Subject: [PATCH 1/4] LArGeoHec: cmake fixes Library dependency fixes. --- LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt index b61f869860fa..9dd517c31272 100644 --- a/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt +++ b/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt @@ -26,5 +26,5 @@ atlas_add_library( LArGeoHec PUBLIC_HEADERS LArGeoHec PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS} LINK_LIBRARIES StoreGateLib SGtests - PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities GaudiKernel ) + PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities GaudiKernel RDBAccessSvcLib ) -- GitLab From 0640c4ad44530a2feef1dbe614859d1ca678d988 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Fri, 10 Apr 2020 16:46:49 +0200 Subject: [PATCH 2/4] LArGeoH6Cryostats: cmake fixes Library dependency fixes. --- LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt index 5406a701759e..7c2b9517bb81 100644 --- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt +++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt @@ -24,5 +24,5 @@ atlas_add_library( LArGeoH6Cryostats PUBLIC_HEADERS LArGeoH6Cryostats PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS} LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests - PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} GaudiKernel ) + PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} GaudiKernel GeoModelInterfaces RDBAccessSvcLib ) -- GitLab From f5e5291f459df1e6d6e136a33259335bec3d3db2 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Fri, 10 Apr 2020 16:47:07 +0200 Subject: [PATCH 3/4] LArGeoH62004Algs: cmake fixes Library dependency fixes. --- LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt index b8ad4c1af112..2455af7cbcf2 100644 --- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt +++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt @@ -33,7 +33,7 @@ atlas_add_component( LArGeoH62004Algs src/*.cxx src/components/*.cxx INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS} - LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests GeoModelUtilities LArReadoutGeometry CaloDetDescrLib AthContainers GaudiKernel LArG4RunControl LArGeoCode LArGeoEndcap LArGeoH6Cryostats LArGeoTBECLib ) + LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests GeoModelUtilities LArReadoutGeometry CaloDetDescrLib AthContainers GaudiKernel LArG4RunControl LArGeoCode LArGeoEndcap LArGeoH6Cryostats LArGeoTBECLib RDBAccessSvcLib ) # Install files from the package: atlas_install_joboptions( share/*.py ) -- GitLab From 72570939c0f83da47a75e0ba450a8b1679b39d17 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Fri, 10 Apr 2020 16:47:25 +0200 Subject: [PATCH 4/4] LArGeoAlgsNV: cmake fixes Library dependency fixes. --- LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt index 2cde3c0c134e..4d5bc4fbe506 100644 --- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt +++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt @@ -37,7 +37,7 @@ atlas_add_component( LArGeoAlgsNV src/*.cxx src/components/*.cxx INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS} - LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} ${EIGEN_LIBRARIES} GeoModelUtilities LArReadoutGeometry SGTools StoreGateLib SGtests DetDescrConditions GaudiKernel LArGeoBarrel LArGeoCode LArGeoEndcap LArGeoRAL LArGeoTBBarrel LArHV ) + LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} ${EIGEN_LIBRARIES} GeoModelUtilities LArReadoutGeometry SGTools StoreGateLib SGtests DetDescrConditions GaudiKernel LArGeoBarrel LArGeoCode LArGeoEndcap LArGeoRAL LArGeoTBBarrel LArHV RDBAccessSvcLib ) # Install files from the package: atlas_install_python_modules( python/*.py ) -- GitLab