From b8c80ada2569efa972b3cfb112ac999731c62228 Mon Sep 17 00:00:00 2001 From: "Ewelina.Maria.Lobodzinska" <ewelina.maria.lobodzinska@cern.ch> Date: Tue, 2 Jul 2019 17:12:05 +0200 Subject: [PATCH] fix synatax problem in MadGraphControl change GENERATOR_VERSION -> GENERATOR_LCGVERSION --- Generators/Epos_i/EposEnvironmentConfig.cmake | 2 +- Generators/EvtGen_i/EvtGenEnvironmentConfig.cmake | 2 +- Generators/Herwig7_i/CMakeLists.txt | 2 +- Generators/Herwig7_i/Herwig7EnvironmentConfig.cmake | 4 ++-- Generators/Herwig_i/CMakeLists.txt | 2 +- Generators/Herwigpp_i/CMakeLists.txt | 2 +- Generators/Hijing_i/CMakeLists.txt | 2 +- .../MadGraphControl/MadGraphControlEnvironmentConfig.cmake | 2 +- Generators/MadGraphControl/python/MadGraphUtils.py | 4 ++-- Generators/Photospp_i/PhotosppEnvironmentConfig.cmake | 2 +- Generators/Pythia8_i/CMakeLists.txt | 2 +- Generators/Pythia8_i/Pythia8EnvironmentConfig.cmake | 4 ++-- Generators/Pythia_i/CMakeLists.txt | 2 +- Generators/QGSJet_i/QGSJetEnvironmentConfig.cmake | 2 +- Generators/Rivet_i/RivetEnvironmentConfig.cmake | 4 ++-- Generators/Sherpa_i/SherpaEnvironmentConfig.cmake | 2 +- Generators/Starlight_i/StarlightEnvironmentConfig.cmake | 2 +- Generators/Tauolapp_i/TauolappEnvironmentConfig.cmake | 2 +- Generators/TruthUtils/TruthUtilsEnvironmentConfig.cmake | 4 ++-- Projects/AthGeneration/externals/Crmc.cmake | 4 ++-- Projects/AthGeneration/externals/EvtGen.cmake | 4 ++-- Projects/AthGeneration/externals/HEPUtils.cmake | 4 ++-- Projects/AthGeneration/externals/Herwig.cmake | 4 ++-- Projects/AthGeneration/externals/Herwig3.cmake | 4 ++-- Projects/AthGeneration/externals/Hydjet.cmake | 4 ++-- Projects/AthGeneration/externals/Lhapdf.cmake | 4 ++-- Projects/AthGeneration/externals/MCUtils.cmake | 4 ++-- Projects/AthGeneration/externals/MadGraph5Amc.cmake | 4 ++-- Projects/AthGeneration/externals/Photospp.cmake | 4 ++-- Projects/AthGeneration/externals/Pythia6.cmake | 4 ++-- Projects/AthGeneration/externals/Pythia8.cmake | 4 ++-- Projects/AthGeneration/externals/README.md | 2 +- Projects/AthGeneration/externals/Rivet.cmake | 4 ++-- Projects/AthGeneration/externals/Sherpa.cmake | 4 ++-- Projects/AthGeneration/externals/Starlight.cmake | 4 ++-- Projects/AthGeneration/externals/Superchic.cmake | 4 ++-- Projects/AthGeneration/externals/Tauolapp.cmake | 4 ++-- Projects/AthGeneration/externals/ThePEG.cmake | 4 ++-- Projects/AthGeneration/externals/YODA.cmake | 4 ++-- 39 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Generators/Epos_i/EposEnvironmentConfig.cmake b/Generators/Epos_i/EposEnvironmentConfig.cmake index a642a0f2af87..7154af410d50 100644 --- a/Generators/Epos_i/EposEnvironmentConfig.cmake +++ b/Generators/Epos_i/EposEnvironmentConfig.cmake @@ -9,7 +9,7 @@ find_package( Crmc ) if( CRMC_FOUND ) set( EPOSENVIRONMENT_ENVIRONMENT - FORCESET EPOSVER ${CRMC_VERSION} ) + FORCESET EPOSVER ${CRMC_LCGVERSION} ) endif() # Silently declare the module found: diff --git a/Generators/EvtGen_i/EvtGenEnvironmentConfig.cmake b/Generators/EvtGen_i/EvtGenEnvironmentConfig.cmake index 1459ce76c916..0c4f511e65a7 100644 --- a/Generators/EvtGen_i/EvtGenEnvironmentConfig.cmake +++ b/Generators/EvtGen_i/EvtGenEnvironmentConfig.cmake @@ -9,7 +9,7 @@ find_package( EvtGen ) if( EVTGEN_FOUND ) set( EVTGENENVIRONMENT_ENVIRONMENT - FORCESET EVTGENVER ${EVTGEN_VERSION} ) + FORCESET EVTGENVER ${EVTGEN_LCGVERSION} ) endif() # Silently declare the module found: diff --git a/Generators/Herwig7_i/CMakeLists.txt b/Generators/Herwig7_i/CMakeLists.txt index a30109ce0d03..dd5fddaf341d 100644 --- a/Generators/Herwig7_i/CMakeLists.txt +++ b/Generators/Herwig7_i/CMakeLists.txt @@ -29,7 +29,7 @@ atlas_add_component( Herwig7_i Herwig7_i/*.h src/*.cxx src/components/*.cxx INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HERWIG3_INCLUDE_DIRS} ${THEPEG_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} - PRIVATE_DEFINITIONS -DHWVERSION=\"${HERWIG7_VERSION}\" + PRIVATE_DEFINITIONS -DHWVERSION=\"${HERWIG7_LCGVERSION}\" LINK_LIBRARIES ${HERWIG3_LCGROOT}/lib/Herwig/libHerwigAPI.so ${Boost_LIBRARIES} ${HERWIG7_LIBRARIES} ${THEPEG_LIBRARIES} ${GSL_LIBRARIES} GeneratorModulesLib EventInfo GaudiKernel PathResolver ) diff --git a/Generators/Herwig7_i/Herwig7EnvironmentConfig.cmake b/Generators/Herwig7_i/Herwig7EnvironmentConfig.cmake index eda7a0f354be..e493c244488f 100644 --- a/Generators/Herwig7_i/Herwig7EnvironmentConfig.cmake +++ b/Generators/Herwig7_i/Herwig7EnvironmentConfig.cmake @@ -12,8 +12,8 @@ if( HERWIG3_FOUND AND THEPEG_FOUND ) get_filename_component( _herwig3Path "${HERWIG3_LCGROOT}" DIRECTORY ) set( HERWIG7ENVIRONMENT_ENVIRONMENT FORCESET HERWIG7_PATH ${_herwig3Path}/${LCG_PLATFORM} - FORCESET HERWIG7VER ${HERWIG3_VERSION} - FORCESET THEPEGVER ${THEPEG_VERSION}) + FORCESET HERWIG7VER ${HERWIG3_LCGVERSION} + FORCESET THEPEGVER ${THEPEG_LCGVERSION}) unset( _herwig3Path ) endif() diff --git a/Generators/Herwig_i/CMakeLists.txt b/Generators/Herwig_i/CMakeLists.txt index 24ba1757e5db..8a341285528f 100644 --- a/Generators/Herwig_i/CMakeLists.txt +++ b/Generators/Herwig_i/CMakeLists.txt @@ -30,7 +30,7 @@ find_package( Jimmy ) find_package( Lhapdf ) find_package( GSL ) -add_definitions(-DHWVERSION="${HERWIG_VERSION}") +add_definitions(-DHWVERSION="${HERWIG_LCGVERSION}") # Remove the --as-needed linker flags: atlas_disable_as_needed() diff --git a/Generators/Herwigpp_i/CMakeLists.txt b/Generators/Herwigpp_i/CMakeLists.txt index 6a7905dcad3a..d95675f21447 100644 --- a/Generators/Herwigpp_i/CMakeLists.txt +++ b/Generators/Herwigpp_i/CMakeLists.txt @@ -29,7 +29,7 @@ atlas_add_component( Herwigpp_i Herwigpp_i/*.h src/*.cxx src/components/*.cxx INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ${HERWIG3_INCLUDE_DIRS} ${THEPEG_INCLUDE_DIRS} - PRIVATE_DEFINITIONS -DHWVERSION=\"${HERWIGPP_VERSION}\" + PRIVATE_DEFINITIONS -DHWVERSION=\"${HERWIGPP_LCGVERSION}\" LINK_LIBRARIES ${Boost_LIBRARIES} ${GSL_LIBRARIES} ${HERWIGPP_LIBRARIES} ${THEPEG_LIBRARIES} GeneratorModulesLib EventInfo GaudiKernel PathResolver ) diff --git a/Generators/Hijing_i/CMakeLists.txt b/Generators/Hijing_i/CMakeLists.txt index 728aa2a67c69..cc864d4d56a6 100644 --- a/Generators/Hijing_i/CMakeLists.txt +++ b/Generators/Hijing_i/CMakeLists.txt @@ -23,7 +23,7 @@ find_package( HepMC ) find_package( Hijing ) find_package( ROOT COMPONENTS minicern Core Tree MathCore Hist RIO pthread ) -add_definitions(-DHIJINGVERSION=\"${HHIJING_VERSION}\") +add_definitions(-DHIJINGVERSION=\"${HIJING_LCGVERSION}\") # Remove the --as-needed linker flags: atlas_disable_as_needed() diff --git a/Generators/MadGraphControl/MadGraphControlEnvironmentConfig.cmake b/Generators/MadGraphControl/MadGraphControlEnvironmentConfig.cmake index 181c685d26b1..ec75734ed334 100644 --- a/Generators/MadGraphControl/MadGraphControlEnvironmentConfig.cmake +++ b/Generators/MadGraphControl/MadGraphControlEnvironmentConfig.cmake @@ -11,7 +11,7 @@ if( FASTJET_FOUND AND MADGRAPH_FOUND ) get_filename_component( _fastjetPath "${FASTJET_INCLUDE_DIR}" DIRECTORY ) set( MADGRAPHCONTROLENVIRONMENT_ENVIRONMENT FORCESET FASTJETPATH ${_fastjetPath} - FORCESET MADGRAPHVER ${MADGRAPH5AMC_VERSION}) + FORCESET MADGRAPHVER ${MADGRAPH5AMC_LCGVERSION}) unset( _fastjetPath ) endif() diff --git a/Generators/MadGraphControl/python/MadGraphUtils.py b/Generators/MadGraphControl/python/MadGraphUtils.py index 2185170f20f4..9b2013b16545 100755 --- a/Generators/MadGraphControl/python/MadGraphUtils.py +++ b/Generators/MadGraphControl/python/MadGraphUtils.py @@ -104,14 +104,14 @@ def new_process(card_loc='proc_card_mg5.dat',grid_pack=None): mglog.info('Finished process generation at '+str(time.asctime())) thedir = None - for adir in glob( os.getcwd()+'/*PROC*~' ).sort(reverse=True): + for adir in glob.glob( os.getcwd()+'/*PROC*~' ).sort(reverse=True): if os.access('%s/SubProcesses/subproc.mg'%thedir,os.R_OK): if thedir==None: thedir=adir else: mglog.warning('Additional possible process directory, '+adir+' found. Had '+thedir) mglog.warning('Likely this is because you did not run from a clean directory, and this may cause errors later.') if thedir==None: - raise RuntimeError('No diagrams for this process in dir='+str(thedir)+' from list: '+glob( os.getcwd()+'/*PROC*~' ).sort(reverse=True)) + raise RuntimeError('No diagrams for this process in dir='+str(thedir)+' from list: '+glob.glob( os.getcwd()+'/*PROC*~' ).sort(reverse=True)) # Special catch related to path setting and using afs import os diff --git a/Generators/Photospp_i/PhotosppEnvironmentConfig.cmake b/Generators/Photospp_i/PhotosppEnvironmentConfig.cmake index f561d30d1efe..d2d5179d08d7 100644 --- a/Generators/Photospp_i/PhotosppEnvironmentConfig.cmake +++ b/Generators/Photospp_i/PhotosppEnvironmentConfig.cmake @@ -9,7 +9,7 @@ find_package( Photospp ) if( PHOTOSPP_FOUND ) set( PHOTOSPPENVIRONMENT_ENVIRONMENT - FORCESET PHOTOSPPVER ${PHOTOSPP_VERSION}) + FORCESET PHOTOSPPVER ${PHOTOSPP_LCGVERSION}) endif() # Silently declare the module found: diff --git a/Generators/Pythia8_i/CMakeLists.txt b/Generators/Pythia8_i/CMakeLists.txt index 059cc78d5f62..023f439ef347 100644 --- a/Generators/Pythia8_i/CMakeLists.txt +++ b/Generators/Pythia8_i/CMakeLists.txt @@ -26,7 +26,7 @@ find_package( CLHEP ) find_package( Lhapdf ) find_package( Pythia8 ) -add_definitions(-DPY8VERSION=\"${PYTHIA8_VERSION}\") +add_definitions(-DPY8VERSION=\"${PYTHIA8_LCGVERSION}\") # Remove the --as-needed linker flags: atlas_disable_as_needed() diff --git a/Generators/Pythia8_i/Pythia8EnvironmentConfig.cmake b/Generators/Pythia8_i/Pythia8EnvironmentConfig.cmake index 3cd161210343..e0bf4ba80b02 100644 --- a/Generators/Pythia8_i/Pythia8EnvironmentConfig.cmake +++ b/Generators/Pythia8_i/Pythia8EnvironmentConfig.cmake @@ -10,8 +10,8 @@ find_package( Lhapdf ) if( PYTHIA8_FOUND AND LHAPDF_FOUND ) set( PYTHIA8ENVIRONMENT_ENVIRONMENT - FORCESET PYTHIA8VER ${PYTHIA8_VERSION} - FORCESET LHAPDFVER ${LHAPDF_VERSION} ) + FORCESET PYTHIA8VER ${PYTHIA8_LCGVERSION} + FORCESET LHAPDFVER ${LHAPDF_LCGVERSION} ) endif() # Silently declare the module found: diff --git a/Generators/Pythia_i/CMakeLists.txt b/Generators/Pythia_i/CMakeLists.txt index 07239f01c588..0c91ce90d5ad 100644 --- a/Generators/Pythia_i/CMakeLists.txt +++ b/Generators/Pythia_i/CMakeLists.txt @@ -28,7 +28,7 @@ find_package( HepMC COMPONENTS HepMC HepMCfio ) find_package( Lhapdf ) find_package( Pythia6 ) -add_definitions(-DPY6VERSION="${PYTHIA6_VERSION}") +add_definitions(-DPY6VERSION="${PYTHIA6_LCGVERSION}") # Remove the --as-needed linker flags: atlas_disable_as_needed() diff --git a/Generators/QGSJet_i/QGSJetEnvironmentConfig.cmake b/Generators/QGSJet_i/QGSJetEnvironmentConfig.cmake index bc2db30dd56e..b9e155f793da 100644 --- a/Generators/QGSJet_i/QGSJetEnvironmentConfig.cmake +++ b/Generators/QGSJet_i/QGSJetEnvironmentConfig.cmake @@ -9,7 +9,7 @@ find_package( Crmc ) if( CRMC_FOUND ) set( QGSJETENVIRONMENT_ENVIRONMENT - FORCESET QGSJETVER ${CRMC_VERSION} ) + FORCESET QGSJETVER ${CRMC_LCGVERSION} ) endif() # Silently declare the module found: diff --git a/Generators/Rivet_i/RivetEnvironmentConfig.cmake b/Generators/Rivet_i/RivetEnvironmentConfig.cmake index 394dcebf32fb..27f9f8163435 100644 --- a/Generators/Rivet_i/RivetEnvironmentConfig.cmake +++ b/Generators/Rivet_i/RivetEnvironmentConfig.cmake @@ -11,8 +11,8 @@ find_package( YODA ) if( RIVET_FOUND AND YODA_FOUND ) get_filename_component( _rivetPath "${RIVET_LCGROOT}" DIRECTORY ) set( RIVETENVIRONMENT_ENVIRONMENT - FORCESET RIVETVER ${RIVET_VERSION} - FORCESET YODAVER ${YODA_VERSION} + FORCESET RIVETVER ${RIVET_LCGVERSION} + FORCESET YODAVER ${YODA_LCGVERSION} FORCESET RIVET_PATH ${_rivetPath}/${LCG_PLATFORM}) unset( _rivetPath ) endif() diff --git a/Generators/Sherpa_i/SherpaEnvironmentConfig.cmake b/Generators/Sherpa_i/SherpaEnvironmentConfig.cmake index e493adf490a2..3ab2cf0f9b02 100644 --- a/Generators/Sherpa_i/SherpaEnvironmentConfig.cmake +++ b/Generators/Sherpa_i/SherpaEnvironmentConfig.cmake @@ -9,7 +9,7 @@ find_package( Sherpa ) if( SHERPA_FOUND ) set( SHERPAENVIRONMENT_ENVIRONMENT - FORCESET SHERPAVER ${SHERPA_VERSION} ) + FORCESET SHERPAVER ${SHERPA_LCGVERSION} ) endif() # Silently declare the module found: diff --git a/Generators/Starlight_i/StarlightEnvironmentConfig.cmake b/Generators/Starlight_i/StarlightEnvironmentConfig.cmake index 6d138e4a3ed7..31535b7e0012 100644 --- a/Generators/Starlight_i/StarlightEnvironmentConfig.cmake +++ b/Generators/Starlight_i/StarlightEnvironmentConfig.cmake @@ -9,7 +9,7 @@ find_package( Starlight ) if( STARLIGHT_FOUND ) set( STARLIGHTENVIRONMENT_ENVIRONMENT - FORCESET STARLIGHTVER ${HERWIG3_VERSION} ) + FORCESET STARLIGHTVER ${STARLIGHT_LCGVERSION} ) endif() # Silently declare the module found: diff --git a/Generators/Tauolapp_i/TauolappEnvironmentConfig.cmake b/Generators/Tauolapp_i/TauolappEnvironmentConfig.cmake index d40f6d1c2b66..3b7f04eb3782 100644 --- a/Generators/Tauolapp_i/TauolappEnvironmentConfig.cmake +++ b/Generators/Tauolapp_i/TauolappEnvironmentConfig.cmake @@ -9,7 +9,7 @@ find_package( Tauolapp ) if( TAUOLAPP_FOUND ) set( TAUOLAPPENVIRONMENT_ENVIRONMENT - FORCESET TAUOLAPPVER ${TAUOLAPP_VERSION}) + FORCESET TAUOLAPPVER ${TAUOLAPP_LCGVERSION}) endif() # Silently declare the module found: diff --git a/Generators/TruthUtils/TruthUtilsEnvironmentConfig.cmake b/Generators/TruthUtils/TruthUtilsEnvironmentConfig.cmake index 82892dcbd1ef..3db4bbc40b3f 100644 --- a/Generators/TruthUtils/TruthUtilsEnvironmentConfig.cmake +++ b/Generators/TruthUtils/TruthUtilsEnvironmentConfig.cmake @@ -10,8 +10,8 @@ find_package( MCUtils ) if( HEPUTILS_FOUND AND MCUTILS_FOUND ) set( TRUTHUTILSENVIRONMENT_ENVIRONMENT - FORCESET MCUTILSVER ${MCUTILS_VERSION} - FORCESET HEPUTILSVER ${HEPUTILS_VERSION} ) + FORCESET MCUTILSVER ${MCUTILS_LCGVERSION} + FORCESET HEPUTILSVER ${HEPUTILS_LCGVERSION} ) endif() # Silently declare the module found: diff --git a/Projects/AthGeneration/externals/Crmc.cmake b/Projects/AthGeneration/externals/Crmc.cmake index 34a73c06441e..9e2df0cfec92 100644 --- a/Projects/AthGeneration/externals/Crmc.cmake +++ b/Projects/AthGeneration/externals/Crmc.cmake @@ -2,6 +2,6 @@ # File specifying the location of Crmc to use. # -set( CRMC_VERSION 1.5.4 ) +set( CRMC_LCGVERSION 1.6.0 ) set( CRMC_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/EvtGen.cmake b/Projects/AthGeneration/externals/EvtGen.cmake index 8ff8d86a5f69..b6b2c0a3ec1c 100644 --- a/Projects/AthGeneration/externals/EvtGen.cmake +++ b/Projects/AthGeneration/externals/EvtGen.cmake @@ -2,6 +2,6 @@ # File specifying the location of EvtGen to use. # -set( EVTGEN_VERSION 1.6.0 ) +set( EVTGEN_LCGVERSION 1.6.0 ) set( EVTGEN_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/evtgen/${EVTGEN_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/evtgen/${EVTGEN_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/HEPUtils.cmake b/Projects/AthGeneration/externals/HEPUtils.cmake index d86a2b982510..27acb546c018 100644 --- a/Projects/AthGeneration/externals/HEPUtils.cmake +++ b/Projects/AthGeneration/externals/HEPUtils.cmake @@ -2,6 +2,6 @@ # File specifying the location of HEPUtils to use. # -set( HEPUTILS_VERSION 1.1.0 ) +set( HEPUTILS_LCGVERSION 1.1.0 ) set( HEPUTILS_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Herwig.cmake b/Projects/AthGeneration/externals/Herwig.cmake index 63f681fa67d2..5b0f25a9dd99 100644 --- a/Projects/AthGeneration/externals/Herwig.cmake +++ b/Projects/AthGeneration/externals/Herwig.cmake @@ -2,6 +2,6 @@ # File specifying the location of Herwig to use. # -set( HERWIG_VERSION 6.520.2 ) +set( HERWIG_LCGVERSION 6.520.2 ) set( HERWIG_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/herwig/${HERWIG_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/herwig/${HERWIG_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Herwig3.cmake b/Projects/AthGeneration/externals/Herwig3.cmake index 5ce096e2094a..32650681df1d 100644 --- a/Projects/AthGeneration/externals/Herwig3.cmake +++ b/Projects/AthGeneration/externals/Herwig3.cmake @@ -2,6 +2,6 @@ # File specifying the location of Herwig3 to use. # -set( HERWIG3_VERSION 7.1.5p3 ) +set( HERWIG3_LCGVERSION 7.1.5p3 ) set( HERWIG3_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/herwig++/${HERWIG3_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/herwig++/${HERWIG3_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Hydjet.cmake b/Projects/AthGeneration/externals/Hydjet.cmake index 151846191560..637f1ac350e4 100644 --- a/Projects/AthGeneration/externals/Hydjet.cmake +++ b/Projects/AthGeneration/externals/Hydjet.cmake @@ -2,6 +2,6 @@ # File specifying the location of Hydjet to use. # -set( HYDJET_VERSION 1.6 ) +set( HYDJET_LCGVERSION 1.6 ) set( HYDJET_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/hydjet/${HYDJET_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/hydjet/${HYDJET_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Lhapdf.cmake b/Projects/AthGeneration/externals/Lhapdf.cmake index 1147ad708832..03c1e85b5a88 100644 --- a/Projects/AthGeneration/externals/Lhapdf.cmake +++ b/Projects/AthGeneration/externals/Lhapdf.cmake @@ -2,6 +2,6 @@ # File specifying the location of Lhapdf to use. # -set( LHAPDF_VERSION 6.2.3 ) +set( LHAPDF_LCGVERSION 6.2.3 ) set( LHAPDF_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/lhapdf/${LHAPDF_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/lhapdf/${LHAPDF_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/MCUtils.cmake b/Projects/AthGeneration/externals/MCUtils.cmake index 2497f5dc9d42..9c05971e8244 100644 --- a/Projects/AthGeneration/externals/MCUtils.cmake +++ b/Projects/AthGeneration/externals/MCUtils.cmake @@ -2,6 +2,6 @@ # File specifying the location of MCUtils to use. # -set( MCUTILS_VERSION 1.2.1 ) +set( MCUTILS_LCGVERSION 1.2.1 ) set( MCUTILS_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/MadGraph5Amc.cmake b/Projects/AthGeneration/externals/MadGraph5Amc.cmake index eb7f1b901b06..f567c5699d26 100644 --- a/Projects/AthGeneration/externals/MadGraph5Amc.cmake +++ b/Projects/AthGeneration/externals/MadGraph5Amc.cmake @@ -2,6 +2,6 @@ # File specifying the location of MadGraph to use. # -set( MADGRAPH5AMC_VERSION 2.6.5p3.atlas3) +set( MADGRAPH5AMC_LCGVERSION 2.6.5p3.atlas3) set( MADGRAPH5AMC_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/madgraph5amc/${MADGRAPH5AMC_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/madgraph5amc/${MADGRAPH5AMC_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Photospp.cmake b/Projects/AthGeneration/externals/Photospp.cmake index e19015f4a2a7..8e0b8c2deae5 100644 --- a/Projects/AthGeneration/externals/Photospp.cmake +++ b/Projects/AthGeneration/externals/Photospp.cmake @@ -2,6 +2,6 @@ # File specifying the location of Photos++ to use. # -set( PHOTOSPP_VERSION 3.61 ) +set( PHOTOSPP_LCGVERSION 3.61 ) set( PHOTOSPP_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Pythia6.cmake b/Projects/AthGeneration/externals/Pythia6.cmake index 1e983e9372f5..0531af48046a 100644 --- a/Projects/AthGeneration/externals/Pythia6.cmake +++ b/Projects/AthGeneration/externals/Pythia6.cmake @@ -2,6 +2,6 @@ # File specifying the location of Pythia 6 to use. # -set( PYTHIA6_VERSION 428.2 ) +set( PYTHIA6_LCGVERSION 428.2 ) set( PYTHIA6_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/pythia6/${PYTHIA6_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/pythia6/${PYTHIA6_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Pythia8.cmake b/Projects/AthGeneration/externals/Pythia8.cmake index 09d7bdbc10b6..489a6ee57080 100644 --- a/Projects/AthGeneration/externals/Pythia8.cmake +++ b/Projects/AthGeneration/externals/Pythia8.cmake @@ -2,6 +2,6 @@ # File specifying the location of Pythia 8 to use. # -set( PYTHIA8_VERSION 240p3 ) +set( PYTHIA8_LCGVERSION 240p3 ) set( PYTHIA8_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/pythia8/${PYTHIA8_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/pythia8/${PYTHIA8_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/README.md b/Projects/AthGeneration/externals/README.md index 3d4d5c468958..a0b5ddb141d9 100644 --- a/Projects/AthGeneration/externals/README.md +++ b/Projects/AthGeneration/externals/README.md @@ -13,7 +13,7 @@ The files should define all the variables expected by the Find<Bla> modules, which normally boil down to variables: `EXTNAME_LCGROOT` -`EXTNAME_VERSION` +`EXTNAME_LCGVERSION` But some modules may require other variables. In which case the `_LCGROOT` variable should still be set, to get a nice printout from the AtlasExternals diff --git a/Projects/AthGeneration/externals/Rivet.cmake b/Projects/AthGeneration/externals/Rivet.cmake index 6b26fdd13975..a1876fcdbb7e 100644 --- a/Projects/AthGeneration/externals/Rivet.cmake +++ b/Projects/AthGeneration/externals/Rivet.cmake @@ -1,6 +1,6 @@ # # File specifying the location of Rivet to use. # -set( RIVET_VERSION 2.7.2b ) +set( RIVET_LCGVERSION 2.7.2b ) set( RIVET_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Sherpa.cmake b/Projects/AthGeneration/externals/Sherpa.cmake index 9d627318e2e4..f8656904b523 100644 --- a/Projects/AthGeneration/externals/Sherpa.cmake +++ b/Projects/AthGeneration/externals/Sherpa.cmake @@ -1,6 +1,6 @@ # # File specifying the location of Sherpa to use. # -set( SHERPA_VERSION 2.2.7p3 ) +set( SHERPA_LCGVERSION 2.2.7p3 ) set( SHERPA_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/sherpa/${SHERPA_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/sherpa/${SHERPA_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Starlight.cmake b/Projects/AthGeneration/externals/Starlight.cmake index 3accd236faae..614bc44908da 100644 --- a/Projects/AthGeneration/externals/Starlight.cmake +++ b/Projects/AthGeneration/externals/Starlight.cmake @@ -2,6 +2,6 @@ # File specifying the location of Starlight to use. # -set( STARLIGHT_VERSION r193 ) +set( STARLIGHT_LCGVERSION r193 ) set( STARLIGHT_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/starlight/${STARLIGHT_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/starlight/${STARLIGHT_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Superchic.cmake b/Projects/AthGeneration/externals/Superchic.cmake index 2ce546ea98d3..1661b9631a6b 100644 --- a/Projects/AthGeneration/externals/Superchic.cmake +++ b/Projects/AthGeneration/externals/Superchic.cmake @@ -2,6 +2,6 @@ # File specifying the location of Superchic 3.0 to use. # -set( SUPERCHIC_VERSION 3.0 ) +set( SUPERCHIC_LCGVERSION 3.0 ) set( SUPERCHIC_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/superchic/${SUPERCHIC_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/superchic/${SUPERCHIC_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Tauolapp.cmake b/Projects/AthGeneration/externals/Tauolapp.cmake index ecd18c6ebfa9..375c6944f2a5 100644 --- a/Projects/AthGeneration/externals/Tauolapp.cmake +++ b/Projects/AthGeneration/externals/Tauolapp.cmake @@ -2,6 +2,6 @@ # File specifying the location of Tauola++ to use. # -set( TAUOLAPP_VERSION 1.1.6 ) +set( TAUOLAPP_LCGVERSION 1.1.6 ) set( TAUOLAPP_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/tauola++/${TAUOLAPP_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/tauola++/${TAUOLAPP_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/ThePEG.cmake b/Projects/AthGeneration/externals/ThePEG.cmake index 989a84b8dba3..afe384e86a2a 100644 --- a/Projects/AthGeneration/externals/ThePEG.cmake +++ b/Projects/AthGeneration/externals/ThePEG.cmake @@ -2,6 +2,6 @@ # File specifying the location of ThePEG to use. # -set( THEPEG_VERSION 2.1.5p3 ) +set( THEPEG_LCGVERSION 2.1.5p3 ) set( THEPEG_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/thepeg/${THEPEG_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/thepeg/${THEPEG_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/YODA.cmake b/Projects/AthGeneration/externals/YODA.cmake index b122f634da15..a5fc3352d5f3 100644 --- a/Projects/AthGeneration/externals/YODA.cmake +++ b/Projects/AthGeneration/externals/YODA.cmake @@ -1,6 +1,6 @@ # # File specifying the location of YODA to use. # -set( YODA_VERSION 1.7.5 ) +set( YODA_LCGVERSION 1.7.5 ) set( YODA_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_VERSION}/${LCG_PLATFORM} ) + ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_LCGVERSION}/${LCG_PLATFORM} ) -- GitLab