From b9ee484626ed59115b1536fc57c0d3964122c7b7 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Mon, 21 Dec 2020 12:44:10 +0100
Subject: [PATCH] Added explicit dependencies on "future" in a couple of
packages.
This was needed to make AthAnalysis depend on this LCG package.
---
Control/AthenaCommon/CMakeLists.txt | 9 ++++++---
Control/AthenaConfiguration/CMakeLists.txt | 3 +++
Control/AthenaPython/CMakeLists.txt | 1 +
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Control/AthenaCommon/CMakeLists.txt b/Control/AthenaCommon/CMakeLists.txt
index f087ae81777..e0ffc081ed6 100644
--- a/Control/AthenaCommon/CMakeLists.txt
+++ b/Control/AthenaCommon/CMakeLists.txt
@@ -3,6 +3,9 @@
# Declare the package name:
atlas_subdir( AthenaCommon )
+# External dependencies.
+find_package( future )
+
# Set up specific Athena runtime environment:
set( AthenaCommonEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
CACHE PATH "Location of AthenaCommonEnvironmentConfig.cmake" )
@@ -11,7 +14,7 @@ find_package( AthenaCommonEnvironment )
# Install files from the package:
atlas_install_python_modules( python/*.py python/Utils
POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/Preparation.py share/Execution.py share/Atlas.UnixStandardJob.py test/*.py
+atlas_install_joboptions( share/Preparation.py share/Execution.py share/Atlas.UnixStandardJob.py test/*.py
share/zeroJO.py share/Atlas_Gen.UnixStandardJob.py share/MemTraceInclude.py share/runbatch.py)
atlas_install_scripts( share/athena.py share/athena_preload.sh share/chappy.py share/test_cfg_pickling.py share/ThinCAWrapper.sh)
atlas_install_runtime(share/*.pkl)
@@ -26,14 +29,14 @@ atlas_add_test( AthAppMgrUnitTests SCRIPT test/test_AthAppMgrUnitTests.sh
atlas_add_test( ConfigurableUnitTests SCRIPT test/test_ConfigurableUnitTests.sh
PROPERTIES TIMEOUT 300
LOG_IGNORE_PATTERN "Warning in <TFile::Init>: no StreamerInfo found|^Ran .* tests in" )
-atlas_add_test( JobOptionsUnitTests SCRIPT test/test_JobOptionsUnitTests.sh
+atlas_add_test( JobOptionsUnitTests SCRIPT test/test_JobOptionsUnitTests.sh
LOG_IGNORE_PATTERN "Warning in <TFile::Init>: no StreamerInfo found|^Ran .* tests in" )
atlas_add_test( JobPropertiesUnitTests SCRIPT test/test_JobPropertiesUnitTests.sh
LOG_IGNORE_PATTERN "Warning in <TFile::Init>: no StreamerInfo found|^Ran .* tests in" )
atlas_add_test( KeyStoreUnitTests SCRIPT test/test_KeyStoreUnitTests.sh
LOG_IGNORE_PATTERN "Warning in <TFile::Init>: no StreamerInfo found|^Ran .* tests in|^outFileName: " )
atlas_add_test( CFElementsTest SCRIPT python -m unittest -v AthenaCommon.CFElements
- POST_EXEC_SCRIPT nopost.sh )
+ POST_EXEC_SCRIPT nopost.sh )
atlas_add_test( GenerateBootstrapTest
SCRIPT test/test_gen_bootstrap.sh
diff --git a/Control/AthenaConfiguration/CMakeLists.txt b/Control/AthenaConfiguration/CMakeLists.txt
index dc6084e7b04..a4f11c6aec0 100644
--- a/Control/AthenaConfiguration/CMakeLists.txt
+++ b/Control/AthenaConfiguration/CMakeLists.txt
@@ -3,6 +3,9 @@
# Declare the package name:
atlas_subdir( AthenaConfiguration )
+# External dependencies.
+find_package( future )
+
# Install files from the package:
atlas_install_python_modules( python/*.py python/iconfTool
POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Control/AthenaPython/CMakeLists.txt b/Control/AthenaPython/CMakeLists.txt
index 460c29c03f8..d4d36343304 100644
--- a/Control/AthenaPython/CMakeLists.txt
+++ b/Control/AthenaPython/CMakeLists.txt
@@ -7,6 +7,7 @@ atlas_subdir( AthenaPython )
find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS Core PyROOT ROOTTPython
cppyy${Python_VERSION_MAJOR}_${Python_VERSION_MINOR} )
+find_package( future )
# Component(s) in the package:
atlas_add_library( AthenaPython
--
GitLab