Skip to content
Snippets Groups Projects
Commit b9c81962 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Yet another attempt to switch to LCG 93

parent d679a942
No related merge requests found
Showing
with 13 additions and 13 deletions
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AnalysisBaseExternalsVersion = 2.0.2 AnalysisBaseExternalsVersion = 2.0.3
# Versions of the various externals to build before starting the build of # Versions of the various externals to build before starting the build of
# this project, when doing a full stack nightly build. # this project, when doing a full stack nightly build.
AnalysisBaseExternalsVersion = 2.0.2 AnalysisBaseExternalsVersion = 2.0.3
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly # an "origin/" prefix before it. For tags however this is explicitly
# forbidden. # forbidden.
AtlasExternalsVersion = 2.0.2 AtlasExternalsVersion = 2.0.3
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthSimulationExternalsVersion = 8bb3de80 AthSimulationExternalsVersion = 2.0.3
# The version of atlas/Gaudi to use: # The version of atlas/Gaudi to use:
GaudiVersion = v30r2.001 GaudiVersion = v30r2.001
...@@ -24,8 +24,8 @@ if( LCG_NIGHTLY ) ...@@ -24,8 +24,8 @@ if( LCG_NIGHTLY )
set( DQM-COMMON_VERSION "99-00-00" ) set( DQM-COMMON_VERSION "99-00-00" )
set( TDAQ_VERSION "99-00-00" ) set( TDAQ_VERSION "99-00-00" )
else() else()
set( TDAQ-COMMON_VERSION "02-04-00" ) set( TDAQ-COMMON_VERSION "02-06-00" )
set( DQM-COMMON_VERSION "01-04-00" ) set( DQM-COMMON_VERSION "01-06-00" )
set( TDAQ_VERSION "07-01-00" ) set( TDAQ_VERSION "07-01-00" )
endif() endif()
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthenaExternalsVersion = 8bb3de80 AthenaExternalsVersion = 2.0.3
# The version of atlas/Gaudi to use: # The version of atlas/Gaudi to use:
GaudiVersion = v30r2.001 GaudiVersion = v30r2.001
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
# File specifying the location of Rivet to use. # File specifying the location of Rivet to use.
# #
set( RIVET_VERSION 2.5.3 ) set( RIVET_VERSION 2.6.0 )
set( RIVET_ROOT set( RIVET_ROOT
${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_VERSION}/${LCG_PLATFORM} ) ${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_VERSION}/${LCG_PLATFORM} )
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
# File specifying the location of YODA to use. # File specifying the location of YODA to use.
# #
set( YODA_VERSION 1.6.6 ) set( YODA_VERSION 1.7.0 )
set( YODA_ROOT set( YODA_ROOT
${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_VERSION}/${LCG_PLATFORM} ) ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_VERSION}/${LCG_PLATFORM} )
...@@ -14,7 +14,7 @@ class VP13DCocktailPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWid ...@@ -14,7 +14,7 @@ class VP13DCocktailPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWid
Q_OBJECT Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #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 # else
Q_EXPORT_PLUGIN2(pnp_vp13dcocktailplugin_vp1autofactory, VP13DCocktailPlugin_VP1AutoFactory) Q_EXPORT_PLUGIN2(pnp_vp13dcocktailplugin_vp1autofactory, VP13DCocktailPlugin_VP1AutoFactory)
#endif #endif
......
...@@ -14,7 +14,7 @@ class VP1TrackCaloPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidg ...@@ -14,7 +14,7 @@ class VP1TrackCaloPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidg
Q_OBJECT Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #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 # else
Q_EXPORT_PLUGIN2(pnp_vp1trackcaloplugin_vp1autofactory, VP1TrackCaloPlugin_VP1AutoFactory) Q_EXPORT_PLUGIN2(pnp_vp1trackcaloplugin_vp1autofactory, VP1TrackCaloPlugin_VP1AutoFactory)
#endif #endif
......
...@@ -14,7 +14,7 @@ class VP1AODPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidgetFact ...@@ -14,7 +14,7 @@ class VP1AODPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidgetFact
Q_OBJECT Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #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 # else
Q_EXPORT_PLUGIN2(pnp_vp1aodplugin_vp1autofactory, VP1AODPlugin_VP1AutoFactory) Q_EXPORT_PLUGIN2(pnp_vp1aodplugin_vp1autofactory, VP1AODPlugin_VP1AutoFactory)
#endif #endif
......
...@@ -13,7 +13,7 @@ class VP1GeometryPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidge ...@@ -13,7 +13,7 @@ class VP1GeometryPlugin_VP1AutoFactory : public QObject, public IVP1ChannelWidge
Q_OBJECT Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #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 # else
Q_EXPORT_PLUGIN2(pnp_vp1geometryplugin_vp1autofactory, VP1GeometryPlugin_VP1AutoFactory) Q_EXPORT_PLUGIN2(pnp_vp1geometryplugin_vp1autofactory, VP1GeometryPlugin_VP1AutoFactory)
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment