Updated the Athena project to atlasexternals-2.0.21.

This required updating all <FOO>_ROOT variable definitions to the new naming
scheme(s) used by AtlasCMake and AtlasLCG.

External/Pythia8/CMakeLists.txt

-# $Id: CMakeLists.txt 728071 2016-03-07 10:51:32Z krasznaa $
 #
 # Package setting up Pythia8 to be used in the ATLAS offline software.
 #
@@ -21,7 +20,7 @@ if( NOT PYTHIA8_FOUND )
 endif()
 
 # Install the files from the xmldoc directory into the offline release.
-set( xmldoc_dir "${PYTHIA8_ROOT}/share/Pythia8/xmldoc" )
+set( xmldoc_dir "${PYTHIA8_LCGROOT}/share/Pythia8/xmldoc" )
 if( NOT IS_DIRECTORY ${xmldoc_dir} )
    message( WARNING "Can't access ${xmldoc_dir}" )
    return()

Projects/Athena/CMakeLists.txt

@@ -16,26 +16,37 @@ if( NOT LCG_NIGHTLY )
        message( STATUS "Using LCG_NIGHTLY: ${LCG_NIGHTLY}" )
    endif()
 endif()
- 
+
 # Set the versions of the TDAQ externals to pick up for the build:
 if( LCG_NIGHTLY )
     # TDAQ_RELEASE_BASE should be set to a NIGHTLY TDAQ build!
-    set( TDAQ-COMMON_VERSION "99-00-00" )
-    set( DQM-COMMON_VERSION "99-00-00" )
-    set( TDAQ_VERSION "99-00-00" )
+    set( TDAQ-COMMON_VERSION "99-00-00" CACHE STRING
+       "The version of tdaq-common to use for the build" )
+    set( DQM-COMMON_VERSION "99-00-00" CACHE STRING
+       "The version of dqm-common to use for the build" )
+    set( TDAQ_VERSION "99-00-00" CACHE STRING
+       "The version of tdaq to use for the build" )
 else()
-    set( TDAQ-COMMON_VERSION "02-09-00" )
-    set( DQM-COMMON_VERSION "01-09-00" )
-    set( TDAQ_VERSION "08-01-01" )
+    set( TDAQ-COMMON_VERSION "02-09-00" CACHE STRING
+       "The version of tdaq-common to use for the build" )
+    set( DQM-COMMON_VERSION "01-09-00" CACHE STRING
+       "The version of dqm-common to use for the build" )
+    set( TDAQ_VERSION "08-01-01" CACHE STRING
+       "The version of tdaq to use for the build" )
 endif()
 
-set( TDAQ-COMMON_ROOT
-   "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}" )
-set( DQM-COMMON_ROOT
-   "$ENV{TDAQ_RELEASE_BASE}/dqm-common/dqm-common-${DQM-COMMON_VERSION}" )
-set( TDAQ_PROJECT_NAME "tdaq")
-set( TDAQ_ROOT
-   "$ENV{TDAQ_RELEASE_BASE}/${TDAQ_PROJECT_NAME}/${TDAQ_PROJECT_NAME}-${TDAQ_VERSION}" )
+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" )
+set( DQM-COMMON_ATROOT
+   "$ENV{TDAQ_RELEASE_BASE}/dqm-common/dqm-common-${DQM-COMMON_VERSION}"
+   CACHE PATH "The directory to pick up dqm-common from" )
+set( TDAQ_PROJECT_NAME "tdaq" CACHE STRING "The name of the tdaq project" )
+set( TDAQ_ATROOT
+   "$ENV{TDAQ_RELEASE_BASE}/${TDAQ_PROJECT_NAME}/${TDAQ_PROJECT_NAME}-${TDAQ_VERSION}"
+   CACHE PATH "The directory to pick up tdaq from" )
+mark_as_advanced( TDAQ-COMMON_ATROOT DQM-COMMON_ATROOT TDAQ_PROJECT_NAME
+   TDAQ_ATROOT )
 
 # Find the ATLAS CMake code:
 find_package( AtlasCMake QUIET )

Projects/Athena/externals.txt

@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.20
+AthenaExternalsVersion = 2.0.21
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v31r0.001

Projects/Athena/externals/Crmc.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Crmc to use.
 #
 
-set( CRMC_VERSION 1.5.4 )
-set( CRMC_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_VERSION}/${LCG_PLATFORM} )
+set( CRMC_LCGVERSION 1.5.4 )
+set( CRMC_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/EvtGen.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of EvtGen to use.
 #
 
-set( EVTGEN_VERSION 1.6.0 )
-set( EVTGEN_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/evtgen/${EVTGEN_VERSION}/${LCG_PLATFORM} )
+set( EVTGEN_LCGVERSION 1.6.0 )
+set( EVTGEN_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/evtgen/${EVTGEN_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/HEPUtils.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of HEPUtils to use.
 #
 
-set( HEPUTILS_VERSION 1.1.0 )
-set( HEPUTILS_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_VERSION}/${LCG_PLATFORM} )
+set( HEPUTILS_LCGVERSION 1.1.0 )
+set( HEPUTILS_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/Herwig.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Herwig to use.
 #
 
-set( HERWIG_VERSION 6.520.2 )
-set( HERWIG_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/herwig/${HERWIG_VERSION}/${LCG_PLATFORM} )
+set( HERWIG_LCGVERSION 6.520.2 )
+set( HERWIG_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/herwig/${HERWIG_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/Herwig3.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Herwig3 to use.
 #
 
-set( HERWIG3_VERSION 7.0.4 )
-set( HERWIG3_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/herwig++/${HERWIG3_VERSION}/${LCG_PLATFORM} )
+set( HERWIG3_LCGVERSION 7.0.4 )
+set( HERWIG3_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/herwig++/${HERWIG3_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/Hydjet.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Hydjet to use.
 #
 
-set( HYDJET_VERSION 1.6 )
-set( HYDJET_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/hydjet/${HYDJET_VERSION}/${LCG_PLATFORM} )
+set( HYDJET_LCGVERSION 1.6 )
+set( HYDJET_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/hydjet/${HYDJET_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/Lhapdf.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Lhapdf to use.
 #
 
-set( LHAPDF_VERSION 6.2.1 )
-set( LHAPDF_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/lhapdf/${LHAPDF_VERSION}/${LCG_PLATFORM} )
+set( LHAPDF_LCGVERSION 6.2.1 )
+set( LHAPDF_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/lhapdf/${LHAPDF_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/MCUtils.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of MCUtils to use.
 #
 
-set( MCUTILS_VERSION 1.3.2 )
-set( MCUTILS_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_VERSION}/${LCG_PLATFORM} )
+set( MCUTILS_LCGVERSION 1.3.2 )
+set( MCUTILS_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/MadGraph5Amc.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of MadGraph to use.
 #
 
-set( MADGRAPH5AMC_VERSION 2.6.1.atlas )
-set( MADGRAPH5AMC_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/madgraph5amc/${MADGRAPH5AMC_VERSION}/${LCG_PLATFORM} )
+set( MADGRAPH5AMC_LCGVERSION 2.6.1.atlas )
+set( MADGRAPH5AMC_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/madgraph5amc/${MADGRAPH5AMC_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/Photospp.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Photos++ to use.
 #
 
-set( PHOTOSPP_VERSION 3.61 )
-set( PHOTOSPP_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_VERSION}/${LCG_PLATFORM} )
+set( PHOTOSPP_LCGVERSION 3.61 )
+set( PHOTOSPP_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/Pythia6.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Pythia 6 to use.
 #
 
-set( PYTHIA6_VERSION 428.2 )
-set( PYTHIA6_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/pythia6/${PYTHIA6_VERSION}/${LCG_PLATFORM} )
+set( PYTHIA6_LCGVERSION 428.2 )
+set( PYTHIA6_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/pythia6/${PYTHIA6_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/Pythia8.cmake

@@ -2,7 +2,6 @@
 # File specifying the location of Pythia 8 to use.
 #
 
-set( PYTHIA8_VERSION 219.pdf6plugin )
-
-set( PYTHIA8_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/pythia8/${PYTHIA8_VERSION}/${LCG_PLATFORM} )
+set( PYTHIA8_LCGVERSION 219.pdf6plugin )
+set( PYTHIA8_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/pythia8/${PYTHIA8_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/Rivet.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Rivet to use.
 #
 
-set( RIVET_VERSION 2.6.0 )
-set( RIVET_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_VERSION}/${LCG_PLATFORM} )
+set( RIVET_LCGVERSION 2.6.0 )
+set( RIVET_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/Sherpa.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Sherpa to use.
 #
 
-set( SHERPA_VERSION 2.2.5 )
-set( SHERPA_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/sherpa/${SHERPA_VERSION}/${LCG_PLATFORM} )
+set( SHERPA_LCGVERSION 2.2.5 )
+set( SHERPA_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/sherpa/${SHERPA_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/Starlight.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Starlight to use.
 #
 
-set( STARLIGHT_VERSION r193 )
-set( STARLIGHT_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/starlight/${STARLIGHT_VERSION}/${LCG_PLATFORM} )
+set( STARLIGHT_LCGVERSION r193 )
+set( STARLIGHT_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/starlight/${STARLIGHT_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/Tauolapp.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Tauola++ to use.
 #
 
-set( TAUOLAPP_VERSION 1.1.6 )
-set( TAUOLAPP_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/tauola++/${TAUOLAPP_VERSION}/${LCG_PLATFORM} )
+set( TAUOLAPP_LCGVERSION 1.1.6 )
+set( TAUOLAPP_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/tauola++/${TAUOLAPP_LCGVERSION}/${LCG_PLATFORM} )

Projects/Athena/externals/ThePEG.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of ThePEG to use.
 #
 
-set( THEPEG_VERSION 2.0.4 )
-set( THEPEG_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/thepeg/${THEPEG_VERSION}/${LCG_PLATFORM} )
+set( THEPEG_LCGVERSION 2.0.4 )
+set( THEPEG_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/thepeg/${THEPEG_LCGVERSION}/${LCG_PLATFORM} )