From b9c81962178b8e96630df42712030fb9fd10bafc Mon Sep 17 00:00:00 2001
From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Sat, 21 Apr 2018 21:47:34 +0200
Subject: [PATCH] Yet another attempt to switch to LCG 93
---
Projects/AnalysisBase/externals.txt | 2 +-
Projects/AnalysisTop/externals.txt | 2 +-
Projects/AthDataQuality/externals.txt | 2 +-
Projects/AthSimulation/externals.txt | 2 +-
Projects/Athena/CMakeLists.txt | 4 ++--
Projects/Athena/externals.txt | 2 +-
Projects/Athena/externals/Rivet.cmake | 2 +-
Projects/Athena/externals/YODA.cmake | 2 +-
.../VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h | 2 +-
.../VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h | 2 +-
.../VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h | 2 +-
.../VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 9fdceb7516c..24c73abbdc3 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.2
+AnalysisBaseExternalsVersion = 2.0.3
diff --git a/Projects/AnalysisTop/externals.txt b/Projects/AnalysisTop/externals.txt
index 8e91a921322..e659c9dca53 100644
--- a/Projects/AnalysisTop/externals.txt
+++ b/Projects/AnalysisTop/externals.txt
@@ -1,4 +1,4 @@
# Versions of the various externals to build before starting the build of
# this project, when doing a full stack nightly build.
-AnalysisBaseExternalsVersion = 2.0.2
+AnalysisBaseExternalsVersion = 2.0.3
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index f183b1331e1..fb63068a5b1 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.2
+AtlasExternalsVersion = 2.0.3
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index b175ef493ea..c5dc776065e 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 8bb3de80
+AthSimulationExternalsVersion = 2.0.3
# The version of atlas/Gaudi to use:
GaudiVersion = v30r2.001
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index 022a6bb9c6d..317c0579d6b 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -24,8 +24,8 @@ if( LCG_NIGHTLY )
set( DQM-COMMON_VERSION "99-00-00" )
set( TDAQ_VERSION "99-00-00" )
else()
- set( TDAQ-COMMON_VERSION "02-04-00" )
- set( DQM-COMMON_VERSION "01-04-00" )
+ set( TDAQ-COMMON_VERSION "02-06-00" )
+ set( DQM-COMMON_VERSION "01-06-00" )
set( TDAQ_VERSION "07-01-00" )
endif()
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 94bb6efd3e4..61d61aa373f 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 8bb3de80
+AthenaExternalsVersion = 2.0.3
# The version of atlas/Gaudi to use:
GaudiVersion = v30r2.001
diff --git a/Projects/Athena/externals/Rivet.cmake b/Projects/Athena/externals/Rivet.cmake
index 64c516a852f..6ef04ba05c8 100644
--- a/Projects/Athena/externals/Rivet.cmake
+++ b/Projects/Athena/externals/Rivet.cmake
@@ -2,6 +2,6 @@
# File specifying the location of Rivet to use.
#
-set( RIVET_VERSION 2.5.3 )
+set( RIVET_VERSION 2.6.0 )
set( RIVET_ROOT
${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_VERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/YODA.cmake b/Projects/Athena/externals/YODA.cmake
index 9d7213d9cd0..5c4f7b407c3 100644
--- a/Projects/Athena/externals/YODA.cmake
+++ b/Projects/Athena/externals/YODA.cmake
@@ -2,6 +2,6 @@
# File specifying the location of YODA to use.
#
-set( YODA_VERSION 1.6.6 )
+set( YODA_VERSION 1.7.0 )
set( YODA_ROOT
${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_VERSION}/${LCG_PLATFORM} )
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h
index b8bc098e62e..0949573db04 100644
--- a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailPlugin_VP1AutoFactory.h
@@ -14,7 +14,7 @@ class VP13DCocktailPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWid
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
- Q_PLUGIN_METADATA(IID "VP13DCocktailPlugin" FILE "") // apparently, FILE can be empty
+ Q_PLUGIN_METADATA(IID "VP13DCocktailPlugin" )
# else
Q_EXPORT_PLUGIN2(pnp_vp13dcocktailplugin_vp1autofactory, VP13DCocktailPlugin_VP1AutoFactory)
#endif
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h
index e3f4b9ea979..b317e563426 100644
--- a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloPlugin_VP1AutoFactory.h
@@ -14,7 +14,7 @@ class VP1TrackCaloPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidg
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
- Q_PLUGIN_METADATA(IID "VP1TrackCaloPlugin" FILE "") // apparently, FILE can be empty
+ Q_PLUGIN_METADATA(IID "VP1TrackCaloPlugin" )
# else
Q_EXPORT_PLUGIN2(pnp_vp1trackcaloplugin_vp1autofactory, VP1TrackCaloPlugin_VP1AutoFactory)
#endif
diff --git a/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h
index 17d5527741f..0c22e42cee9 100644
--- a/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP1AODPlugin/VP1AODPlugin/VP1AODPlugin_VP1AutoFactory.h
@@ -14,7 +14,7 @@ class VP1AODPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidgetFact
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
- Q_PLUGIN_METADATA(IID "VP1AODPlugin" FILE "") // apparently, FILE can be empty
+ Q_PLUGIN_METADATA(IID "VP1AODPlugin" )
# else
Q_EXPORT_PLUGIN2(pnp_vp1aodplugin_vp1autofactory, VP1AODPlugin_VP1AutoFactory)
#endif
diff --git a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h
index 504ecf7636c..acf53538f43 100644
--- a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h
+++ b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/VP1GeometryPlugin/VP1GeometryPlugin_VP1AutoFactory.h
@@ -13,7 +13,7 @@ class VP1GeometryPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidge
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
- Q_PLUGIN_METADATA(IID "VP1GeometryPlugin" FILE "") // apparently, FILE can be empty
+ Q_PLUGIN_METADATA(IID "VP1GeometryPlugin" )
# else
Q_EXPORT_PLUGIN2(pnp_vp1geometryplugin_vp1autofactory, VP1GeometryPlugin_VP1AutoFactory)
#endif
--
GitLab