diff --git a/Control/AthenaExamples/AthExOnnxRuntime/CMakeLists.txt b/Control/AthenaExamples/AthExOnnxRuntime/CMakeLists.txt index 8b9041b976fe867e072039eb32fdcb6c4cbbebfc..433119a28496de4890efeb1be9b2abbe42c67ec2 100644 --- a/Control/AthenaExamples/AthExOnnxRuntime/CMakeLists.txt +++ b/Control/AthenaExamples/AthExOnnxRuntime/CMakeLists.txt @@ -21,8 +21,6 @@ atlas_add_component( AthExOnnxRuntime # Install files from the package. atlas_install_joboptions( share/*.py ) -atlas_install_python_modules( python/OnnxRuntimeConfig.py - POST_BUILD_CMD ${ATLAS_FLAKE8} ) # Set up tests for the package. atlas_add_test( AthExOnnxRuntimeJob_serial diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt index 4cd49083bd4f7a6331ba77e7d6c2ccb9f0516873..245d216727f85f535a8ebf0a8685bb8196008b7e 100644 --- a/Projects/AnalysisBase/externals.txt +++ b/Projects/AnalysisBase/externals.txt @@ -6,4 +6,4 @@ # forbidden. # The version of atlas/atlasexternals to use: -AnalysisBaseExternalsVersion = 2.0.65 +AnalysisBaseExternalsVersion = 2.0.67 diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt index 476a4654143299cac2eab31e444bb277004df532..245674a020236ac94380862c67bcc7d3acac7e0c 100644 --- a/Projects/AthDataQuality/externals.txt +++ b/Projects/AthDataQuality/externals.txt @@ -5,4 +5,4 @@ # an "origin/" prefix before it. For tags however this is explicitly # forbidden. -AtlasExternalsVersion = 2.0.65 +AtlasExternalsVersion = 2.0.67 diff --git a/Projects/AthGeneration/CMakeLists.txt b/Projects/AthGeneration/CMakeLists.txt index a69f765b983333b9ec1eb444f23b07d923b3b30e..2b1dc97f7ab03d8dbd11f8aad3b95b552f4be578 100644 --- a/Projects/AthGeneration/CMakeLists.txt +++ b/Projects/AthGeneration/CMakeLists.txt @@ -8,10 +8,11 @@ project( AthGeneration VERSION ${_version} LANGUAGES C CXX Fortran ) unset( _version ) # Configure flake8: -set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E101,E7,E9,W6 --ignore ATL238,ATL9,E701,E702,E704,E741 --enable-extensions ATL902" +set( ATLAS_FLAKE8 flake8_atlas --select ATL,F,E101,E7,E9,W6 + --ignore ATL238,ATL9,E701,E702,E704,E741 + --enable-extensions ATL902 CACHE STRING "Default flake8 command" ) - -set( ATLAS_PYTHON_CHECKER "${ATLAS_FLAKE8} --filterFiles AthenaConfiguration" +set( ATLAS_PYTHON_CHECKER ${ATLAS_FLAKE8} --filterFiles AthenaConfiguration CACHE STRING "Python checker command to run during Python module compilation" ) # Find the ATLAS CMake code: @@ -77,9 +78,13 @@ string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}" TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" ) string( REPLACE "${TDAQ-COMMON_VERSION}" "\${TDAQ-COMMON_VERSION}" TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" ) +configure_file( ${CMAKE_SOURCE_DIR}/cmake/PreConfig.cmake.in + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PreConfig.cmake @ONLY ) configure_file( ${CMAKE_SOURCE_DIR}/cmake/PostConfig.cmake.in - ${CMAKE_BINARY_DIR}/PostConfig.cmake @ONLY ) -install( FILES ${CMAKE_BINARY_DIR}/PostConfig.cmake + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake @ONLY ) +install( FILES + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PreConfig.cmake + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake DESTINATION ${CMAKE_INSTALL_CMAKEDIR} ) # Package up the release using CPack: diff --git a/Projects/AthGeneration/cmake/PreConfig.cmake.in b/Projects/AthGeneration/cmake/PreConfig.cmake.in new file mode 100644 index 0000000000000000000000000000000000000000..bb88d84693a17223665c82fcbbfcc91d6740f73b --- /dev/null +++ b/Projects/AthGeneration/cmake/PreConfig.cmake.in @@ -0,0 +1,10 @@ +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# +# Pre-config script to propagate variables to downstream projects +# + +# Set up the project's flake8 usage. +set( ATLAS_FLAKE8 @ATLAS_FLAKE8@ + CACHE STRING "Default flake8 command" ) +set( ATLAS_PYTHON_CHECKER @ATLAS_PYTHON_CHECKER@ + CACHE STRING "Python checker command to run during Python module compilation" ) diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt index 2dabe38db588cee1aadad550373df15b3ae53035..de8d585d442decc9995728294a4a4c1690902019 100644 --- a/Projects/AthGeneration/externals.txt +++ b/Projects/AthGeneration/externals.txt @@ -6,7 +6,7 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthGenerationExternalsVersion = 2.0.65 +AthGenerationExternalsVersion = 2.0.67 # The version of atlas/Gaudi to use: GaudiVersion = v33r1.001 diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt index 22ba04f7a411f79610b1be8d44b043b89bc8e3e0..d6025d29256d1a1cf724cc1fa04e0ddd7a15a204 100644 --- a/Projects/AthSimulation/externals.txt +++ b/Projects/AthSimulation/externals.txt @@ -6,7 +6,7 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthSimulationExternalsVersion = 2.0.65 +AthSimulationExternalsVersion = 2.0.67 # The version of atlas/Gaudi to use: GaudiVersion = v33r1.001 diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt index d56dd3b518eee57d5674d43ba213bdac4cf031c2..150d15736ccc99fcf5006078a8db512e0863adfe 100644 --- a/Projects/Athena/CMakeLists.txt +++ b/Projects/Athena/CMakeLists.txt @@ -41,10 +41,11 @@ mark_as_advanced( TDAQ-COMMON_ATROOT TDAQ_PROJECT_NAME TDAQ_ATROOT ) # Configure flake8: -set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E101,E7,E9,W6 --ignore ATL238,ATL9,E701,E702,E704,E741 --enable-extensions ATL902" +set( ATLAS_FLAKE8 flake8_atlas --select ATL,F,E101,E7,E9,W6 + --ignore ATL238,ATL9,E701,E702,E704,E741 + --enable-extensions ATL902 CACHE STRING "Default flake8 command" ) - -set( ATLAS_PYTHON_CHECKER "${ATLAS_FLAKE8} --filterFiles AthenaConfiguration" +set( ATLAS_PYTHON_CHECKER ${ATLAS_FLAKE8} --filterFiles AthenaConfiguration CACHE STRING "Python checker command to run during Python module compilation" ) # Find the ATLAS CMake code: diff --git a/Projects/Athena/cmake/PreConfig.cmake.in b/Projects/Athena/cmake/PreConfig.cmake.in index 7ab85c3097c5fd49b660d0f601f5a8e390892629..9b2078c3cc8200cabfcce4bf36c6d48ae0732f60 100644 --- a/Projects/Athena/cmake/PreConfig.cmake.in +++ b/Projects/Athena/cmake/PreConfig.cmake.in @@ -3,10 +3,10 @@ # Pre-config script to propagate variables to downstream projects # -set( ATLAS_FLAKE8 "@ATLAS_FLAKE8@" +# Set up the project's flake8 usage. +set( ATLAS_FLAKE8 @ATLAS_FLAKE8@ CACHE STRING "Default flake8 command" ) - -set( ATLAS_PYTHON_CHECKER "@ATLAS_PYTHON_CHECKER@" +set( ATLAS_PYTHON_CHECKER @ATLAS_PYTHON_CHECKER@ CACHE STRING "Python checker command to run during Python module compilation" ) # Figure out whether to use QUIET in the following calls. diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt index 0f87b8b7d00b0905365b3cea18d2ac19e8fd85db..e821365accf9bb8b0eb411dbfc1484af610c78eb 100644 --- a/Projects/Athena/externals.txt +++ b/Projects/Athena/externals.txt @@ -6,7 +6,7 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthenaExternalsVersion = 2.0.65 +AthenaExternalsVersion = 2.0.67 # The version of atlas/Gaudi to use: GaudiVersion = v33r1.001 diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt index 765bc91747d6f95d5024de8c19dcbc01af6f0992..ffff1e066b41973875e0cda718dcae312abc0a55 100644 --- a/Projects/VP1Light/externals.txt +++ b/Projects/VP1Light/externals.txt @@ -6,4 +6,4 @@ # forbidden. # The version of atlas/atlasexternals to use: -VP1LightExternalsVersion = 2.0.65 +VP1LightExternalsVersion = 2.0.67 diff --git a/TileCalorimeter/TileMuId/CMakeLists.txt b/TileCalorimeter/TileMuId/CMakeLists.txt index 0356ca5abb51674d4df28ee74cd1608bec863b2c..54456b299d3130d4e93df7189a2cb9115a4deedd 100644 --- a/TileCalorimeter/TileMuId/CMakeLists.txt +++ b/TileCalorimeter/TileMuId/CMakeLists.txt @@ -1,32 +1,20 @@ -################################################################################ -# Package: TileMuId -################################################################################ +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration -# Declare the package name: +# Declare the package name. atlas_subdir( TileMuId ) -# Declare the package's dependencies: -atlas_depends_on_subdirs( PUBLIC - Control/AthenaBaseComps - GaudiKernel - PRIVATE - Calorimeter/CaloEvent - Calorimeter/CaloIdentifier - Control/AthenaKernel - TileCalorimeter/TileEvent ) - -# Component(s) in the package: +# Component(s) in the package. atlas_add_component( TileMuId - src/Tile*.cxx - src/components/*.cxx - LINK_LIBRARIES AthenaBaseComps GaudiKernel CaloEvent CaloIdentifier AthenaKernel TileEvent ) + TileMuId/*.h src/*.cxx src/components/*.cxx + LINK_LIBRARIES AthenaBaseComps GaudiKernel CaloEvent CaloIdentifier + AthenaKernel TileEvent StoreGateLib ) -# Install files from the package: -atlas_install_headers( TileMuId ) -atlas_install_python_modules( python/*.py ) -atlas_install_joboptions( share/*jobOptions*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) +# Install files from the package. +atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) +atlas_install_joboptions( share/*jobOptions*.py ) +# Test(s) in the package. atlas_add_test( TileMuIdConfig_test - SCRIPT python -m TileMuId.TileMuIdConfig - PROPERTIES TIMEOUT 300 - POST_EXEC_SCRIPT nopost.sh) + SCRIPT python -m TileMuId.TileMuIdConfig + PROPERTIES TIMEOUT 300 + POST_EXEC_SCRIPT nopost.sh)