Merge branch 'ExternalsUpdate-master-20170918' into 'master'

Externals Update, master branch (2017.09.18.)

See merge request !4759

Former-commit-id: 5566f8bb

Projects/AnalysisBase/externals.txt

@@ -6,5 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 8643cbb2
-
+AnalysisBaseExternalsVersion = c1f3ff2a

Projects/AnalysisTop/externals.txt

 # Versions of the various externals to build before starting the build of
 # this project, when doing a full stack nightly build.
 
-AnalysisBaseExternalsVersion = 8643cbb2
+AnalysisBaseExternalsVersion = c1f3ff2a

Projects/AthSimulation/externals.txt

@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 8643cbb2
+AthSimulationExternalsVersion = c1f3ff2a
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v28r2.011

Projects/Athena/CMakeLists.txt

@@ -85,10 +85,6 @@ if( NOT "$ENV{NICOS_PROJECT_RELNAME}" STREQUAL "" )
    list( APPEND _replacements $ENV{NICOS_PROJECT_RELNAME}
       "\${Athena_VERSION}" )
 endif()
-if( NOT "$ENV{TDAQ_RELEASE_BASE}" STREQUAL "" )
-   list( APPEND _replacements $ENV{TDAQ_RELEASE_BASE}
-      "\${TDAQ_RELEASE_BASE}" )
-endif()
 
 # Now generate and install the installed setup files:
 lcg_generate_env( SH_FILE ${CMAKE_BINARY_DIR}/env_setup_install.sh

Projects/Athena/externals.txt

@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 8643cbb2
+AthenaExternalsVersion = c1f3ff2a
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v28r2.011