From 20f84293b977a11f16baf72ac182ea4f0d763e4d Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Wed, 8 Mar 2017 14:29:58 +0100
Subject: [PATCH] Moved the specification of which generator version to pick up
from LCG from a few more packages into the central area for the Athena
project. Keeping the version numbers set in the individual packages so far.
---
Generators/Epos_i/CMakeLists.txt | 5 -----
Generators/EvtGen_i/CMakeLists.txt | 15 ---------------
Generators/Photospp_i/CMakeLists.txt | 5 -----
Generators/QGSJet_i/CMakeLists.txt | 5 -----
Generators/Tauolapp_i/CMakeLists.txt | 5 -----
Projects/Athena/externals/EvtGen.cmake | 2 +-
Projects/Athena/externals/Photospp.cmake | 2 +-
Projects/Athena/externals/Tauolapp.cmake | 2 +-
8 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/Generators/Epos_i/CMakeLists.txt b/Generators/Epos_i/CMakeLists.txt
index 144e9f91295..f03ffae0526 100644
--- a/Generators/Epos_i/CMakeLists.txt
+++ b/Generators/Epos_i/CMakeLists.txt
@@ -13,11 +13,6 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
Generators/TruthUtils )
-# Set the version of crmc to use:
-set( CRMC_VERSION 1.5.4 )
-set( CRMC_ROOT
- ${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_VERSION}/${ATLAS_PLATFORM} )
-
# External dependencies:
find_package( CLHEP )
find_package( Crmc COMPONENTS Epos )
diff --git a/Generators/EvtGen_i/CMakeLists.txt b/Generators/EvtGen_i/CMakeLists.txt
index e0f7c7dcff7..e47c478b9ab 100644
--- a/Generators/EvtGen_i/CMakeLists.txt
+++ b/Generators/EvtGen_i/CMakeLists.txt
@@ -14,21 +14,6 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Control/AthenaKernel )
-# Set the version of Tauolapp to use:
-set( TAUOLAPP_VERSION 1.1.6 )
-set( TAUOLAPP_ROOT
- ${LCG_RELEASE_DIR}/MCGenerators/tauola++/${TAUOLAPP_VERSION}/${ATLAS_PLATFORM} )
-
-# Set the version of Photospp to use:
-set( PHOTOSPP_VERSION 3.61 )
-set( PHOTOSPP_ROOT
- ${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_VERSION}/${ATLAS_PLATFORM} )
-
-# Set the version of EvtGen to use:
-set( EVTGEN_VERSION 1.6.0 )
-set( EVTGEN_ROOT
- ${LCG_RELEASE_DIR}/MCGenerators/evtgen/${EVTGEN_VERSION}/${ATLAS_PLATFORM} )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( CLHEP )
diff --git a/Generators/Photospp_i/CMakeLists.txt b/Generators/Photospp_i/CMakeLists.txt
index f345ff5697c..69d10d51128 100644
--- a/Generators/Photospp_i/CMakeLists.txt
+++ b/Generators/Photospp_i/CMakeLists.txt
@@ -14,11 +14,6 @@ atlas_depends_on_subdirs(
GaudiKernel
Generators/GeneratorObjects )
-# Set the version of Photospp to use:
-set( PHOTOSPP_VERSION 3.61 )
-set( PHOTOSPP_ROOT
- ${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_VERSION}/${ATLAS_PLATFORM} )
-
# External dependencies:
find_package( CLHEP )
find_package( Photospp COMPONENTS Photospp PhotosppHepMC )
diff --git a/Generators/QGSJet_i/CMakeLists.txt b/Generators/QGSJet_i/CMakeLists.txt
index dec3b95d8c1..540566b49f6 100644
--- a/Generators/QGSJet_i/CMakeLists.txt
+++ b/Generators/QGSJet_i/CMakeLists.txt
@@ -13,11 +13,6 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
Generators/TruthUtils )
-# Set the version of crmc to use:
-set( CRMC_VERSION 1.5.4 )
-set( CRMC_ROOT
- ${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_VERSION}/${ATLAS_PLATFORM} )
-
# External dependencies:
find_package( CLHEP )
find_package( Crmc COMPONENTS QgsjetII04 )
diff --git a/Generators/Tauolapp_i/CMakeLists.txt b/Generators/Tauolapp_i/CMakeLists.txt
index f74e21aaf82..d32cb0dc0cc 100644
--- a/Generators/Tauolapp_i/CMakeLists.txt
+++ b/Generators/Tauolapp_i/CMakeLists.txt
@@ -15,11 +15,6 @@ atlas_depends_on_subdirs(
GaudiKernel
Generators/GeneratorObjects )
-# Set the version of Tauolapp to use:
-set( TAUOLAPP_VERSION 1.1.6 )
-set( TAUOLAPP_ROOT
- ${LCG_RELEASE_DIR}/MCGenerators/tauola++/${TAUOLAPP_VERSION}/${ATLAS_PLATFORM} )
-
# External dependencies:
find_package( CLHEP )
find_package( HepMC )
diff --git a/Projects/Athena/externals/EvtGen.cmake b/Projects/Athena/externals/EvtGen.cmake
index fa4c1afbcb7..5e867d801b1 100644
--- a/Projects/Athena/externals/EvtGen.cmake
+++ b/Projects/Athena/externals/EvtGen.cmake
@@ -2,6 +2,6 @@
# File specifying the location of EvtGen to use.
#
-set( EVTGEN_VERSION 1.4.0 )
+set( EVTGEN_VERSION 1.6.0 )
set( EVTGEN_ROOT
${LCG_RELEASE_DIR}/MCGenerators/evtgen/${EVTGEN_VERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Photospp.cmake b/Projects/Athena/externals/Photospp.cmake
index 09e714b31f0..3e6761fdf16 100644
--- a/Projects/Athena/externals/Photospp.cmake
+++ b/Projects/Athena/externals/Photospp.cmake
@@ -2,6 +2,6 @@
# File specifying the location of Photos++ to use.
#
-set( PHOTOSPP_VERSION 3.56 )
+set( PHOTOSPP_VERSION 3.61 )
set( PHOTOSPP_ROOT
${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_VERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Tauolapp.cmake b/Projects/Athena/externals/Tauolapp.cmake
index 96321e2ac31..f7ccd72db65 100644
--- a/Projects/Athena/externals/Tauolapp.cmake
+++ b/Projects/Athena/externals/Tauolapp.cmake
@@ -2,6 +2,6 @@
# File specifying the location of Tauola++ to use.
#
-set( TAUOLAPP_VERSION 1.1.1a )
+set( TAUOLAPP_VERSION 1.1.6 )
set( TAUOLAPP_ROOT
${LCG_RELEASE_DIR}/MCGenerators/tauola++/${TAUOLAPP_VERSION}/${LCG_PLATFORM} )
--
GitLab