From 81a6d341221174e420d5695bec889eb49c31006f Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Wed, 19 Feb 2020 14:35:29 +0100
Subject: [PATCH] Stopped AthGeneration from depending on tdaq-common.
As it turns out, it doesn't need it after all.
At the same time fixed the name of the project to AthGeneration.
---
Projects/AthGeneration/CMakeLists.txt | 12 +-----------
Projects/AthGeneration/build_env.sh | 1 -
Projects/AthGeneration/cmake/PostConfig.cmake.in | 5 +----
3 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/Projects/AthGeneration/CMakeLists.txt b/Projects/AthGeneration/CMakeLists.txt
index 5543ccfd8c25..f538c30b54c1 100644
--- a/Projects/AthGeneration/CMakeLists.txt
+++ b/Projects/AthGeneration/CMakeLists.txt
@@ -4,19 +4,9 @@
cmake_minimum_required( VERSION 3.6 )
file( READ ${CMAKE_SOURCE_DIR}/version.txt _version )
string( STRIP ${_version} _version )
-project( Athena VERSION ${_version} LANGUAGES C CXX Fortran )
+project( AthGeneration VERSION ${_version} LANGUAGES C CXX Fortran )
unset( _version )
-# Set the versions of the TDAQ externals to pick up for the build.
-set( TDAQ-COMMON_VERSION "03-04-01" CACHE STRING
- "The version of tdaq-common to use for the build" )
-set( TDAQ_VERSION "08-03-01" CACHE STRING
- "The version of tdaq to use for the build" )
-set( TDAQ-COMMON_ATROOT
- "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}"
- CACHE PATH "The directory to pick up tdaq-common from" )
-mark_as_advanced( TDAQ-COMMON_ATROOT )
-
# Configure flake8:
set( ATLAS_FLAKE8 "flake8_atlas --select ATL,F,E7,E9,W6 --enable-extension ATL902 --extend-ignore E701,E702,E741"
CACHE STRING "Default flake8 command" )
diff --git a/Projects/AthGeneration/build_env.sh b/Projects/AthGeneration/build_env.sh
index 76999aef832e..7327033c5234 100644
--- a/Projects/AthGeneration/build_env.sh
+++ b/Projects/AthGeneration/build_env.sh
@@ -50,7 +50,6 @@ env_setup() {
# Set up the environment variables for finding LCG and the TDAQ externals:
source ${scriptsdir}/LCG_RELEASE_BASE.sh
- source ${scriptsdir}/TDAQ_RELEASE_BASE.sh
# Set up the AthGenerationExternals project:
extDir=${BUILDDIR}/install/AthGenerationExternals/${version}/InstallArea
diff --git a/Projects/AthGeneration/cmake/PostConfig.cmake.in b/Projects/AthGeneration/cmake/PostConfig.cmake.in
index da30d473118a..519cd3345d72 100644
--- a/Projects/AthGeneration/cmake/PostConfig.cmake.in
+++ b/Projects/AthGeneration/cmake/PostConfig.cmake.in
@@ -1,12 +1,9 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# File taking care of pointing the downstream projects at the right
# version of the externals.
#
-# Set the versions of the TDAQ projects:
-set( TDAQ-COMMON_VERSION "@TDAQ-COMMON_VERSION@" )
-set( TDAQ-COMMON_ATROOT "@TDAQ-COMMON_ATROOT@" )
-
# Find Gaudi:
find_package( Gaudi REQUIRED )
--
GitLab