Commit c3c27df5 authored by Ewelina Maria Lobodzinska's avatar Ewelina Maria Lobodzinska
Browse files

change Generator_ROOT to Generator_LCGROOT to be consistent with changes in atlasexternals

parent a2cb2553
......@@ -42,14 +42,14 @@ atlas_add_component( Epos_i
# Install files from the package:
atlas_install_joboptions( share/common/*.py )
atlas_install_runtime( share/file/epos_crmc.param
${CRMC_ROOT}/tabs/dpmjet.dat
${CRMC_ROOT}/tabs/epos.initl
${CRMC_ROOT}/tabs/epos.iniev
${CRMC_ROOT}/tabs/epos.inirj
${CRMC_ROOT}/tabs/epos.inirj.lhc
${CRMC_ROOT}/tabs/epos.inics
${CRMC_ROOT}/tabs/epos.inics.lhc
${CRMC_ROOT}/tabs/epos.inidi )
${CRMC_LCGROOT}/tabs/dpmjet.dat
${CRMC_LCGROOT}/tabs/epos.initl
${CRMC_LCGROOT}/tabs/epos.iniev
${CRMC_LCGROOT}/tabs/epos.inirj
${CRMC_LCGROOT}/tabs/epos.inirj.lhc
${CRMC_LCGROOT}/tabs/epos.inics
${CRMC_LCGROOT}/tabs/epos.inics.lhc
${CRMC_LCGROOT}/tabs/epos.inidi )
set( EposEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
CACHE PATH "Location of EposEnvironment.cmake" )
......
......@@ -30,7 +30,8 @@ atlas_add_component( Herwig7_i
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HERWIG3_INCLUDE_DIRS}
${THEPEG_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS}
PRIVATE_DEFINITIONS -DHWVERSION=\"${HERWIG7_VERSION}\"
LINK_LIBRARIES ${HERWIG3_ROOT}/lib/Herwig/libHerwigAPI.so ${Boost_LIBRARIES} ${HERWIG7_LIBRARIES} ${THEPEG_LIBRARIES} ${GSL_LIBRARIES}
LINK_LIBRARIES ${HERWIG3_LCGROOT}/lib/Herwig/libHerwigAPI.so ${Boost_LIBRARIES}
${HERWIG7_LIBRARIES} ${THEPEG_LIBRARIES} ${GSL_LIBRARIES}
GeneratorModulesLib EventInfo GaudiKernel PathResolver )
# Install files from the package:
......
......@@ -9,7 +9,7 @@ find_package( Herwig3 )
find_package ( ThePEG )
if( HERWIG3_FOUND AND THEPEG_FOUND )
get_filename_component( _herwig3Path "${HERWIG3_ROOT}" DIRECTORY )
get_filename_component( _herwig3Path "${HERWIG3_LCGROOT}" DIRECTORY )
set( HERWIG7ENVIRONMENT_ENVIRONMENT
FORCESET HERWIG7_PATH ${_herwig3Path}/${LCG_PLATFORM}
FORCESET HERWIG7VER ${HERWIG3_VERSION}
......
......@@ -41,9 +41,9 @@ atlas_add_component( QGSJet_i
# Install files from the package:
atlas_install_runtime( share/qgsjet_crmc.param
${CRMC_ROOT}/tabs/dpmjet.dat
${CRMC_ROOT}/tabs/sectnu-II-04
${CRMC_ROOT}/tabs/qgsdat-II-04.lzma )
${CRMC_LCGROOT}/tabs/dpmjet.dat
${CRMC_LCGROOT}/tabs/sectnu-II-04
${CRMC_LCGROOT}/tabs/qgsdat-II-04.lzma )
set( QGSJetEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
CACHE PATH "Location of QGSJetEnvironment.cmake" )
......
......@@ -9,7 +9,7 @@ find_package( Rivet )
find_package( YODA )
if( RIVET_FOUND AND YODA_FOUND )
get_filename_component( _rivetPath "${RIVET_ROOT}" DIRECTORY )
get_filename_component( _rivetPath "${RIVET_LCGROOT}" DIRECTORY )
set( RIVETENVIRONMENT_ENVIRONMENT
FORCESET RIVETVER ${RIVET_VERSION}
FORCESET YODAVER ${YODA_VERSION}
......
......@@ -3,7 +3,8 @@
################################################################################
#set( SHERPA_VERSION 2.2.5 )
#set( SHERPA_ROOT ${LCG_RELEASE_DIR}/MCGenerators/sherpa/${SHERPA_VERSION}/${LCG_PLATFORM} )
#set( SHERPA_ROOT ${LCG_RELEASE_DIR}/MCGenerators/sherpa/${SHERPA_VERSION}/${LCG_PLATFORM}
)
#set( SHERPA_ROOT /cvmfs/sft.cern.ch/lcg/releases/LCG_88/MCGenerators/sherpa/${SHERPA_VERSION}/x86_64-slc6-gcc62-opt )
#set( SHERPA_ROOT /afs/cern.ch/user/f/fsiegert/public/atlas/rel21/sherpa-installation/SHERPA-MC-${SHERPA_VERSION} )
......@@ -36,7 +37,7 @@ atlas_add_component( Sherpa_i
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} ${SHERPA_LIBRARIES}
GaudiKernel GeneratorModulesLib TruthUtils AthenaBaseComps AthenaKernel )
add_definitions(-DSHERPA_ROOT="${SHERPA_ROOT}")
add_definitions(-DSHERPA_ROOT="${SHERPA_LCGROOT}")
atlas_install_joboptions( share/common/*.py )
......
......@@ -223,7 +223,7 @@ void Sherpa_i::compilePlugin(std::string pluginCode) {
FILE *file = fopen("Sherpa_iPlugin.C","w");
fputs(pluginCode.c_str(),file);
fclose(file);
std::string prefix = SHERPA_ROOT; // from Sherpa_i/CMakeLists.txt compile def
std::string prefix = SHERPA_LCGROOT; // from Sherpa_i/CMakeLists.txt compile def
std::string command;
// Python -> C++ string conversion seems to add quote character as first
// and last line if the string contains quotes (like always in a plugin)
......
......@@ -12,16 +12,16 @@ unset( _version )
# Set the versions of the TDAQ externals to pick up for the build:
set( TDAQ-COMMON_VERSION "02-03-00" )
set( TDAQ-COMMON_ROOT
set( TDAQ-COMMON_ATROOT
"$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}" )
set( DQM-COMMON_VERSION "01-03-00" )
set( DQM-COMMON_ROOT
set( DQM-COMMON_ATROOT
"$ENV{TDAQ_RELEASE_BASE}/dqm-common/dqm-common-${DQM-COMMON_VERSION}" )
set( TDAQ_PROJECT_NAME "tdaq")
set( TDAQ_VERSION "07-01-00" )
set( TDAQ_ROOT "$ENV{TDAQ_RELEASE_BASE}/${TDAQ_PROJECT_NAME}/${TDAQ_PROJECT_NAME}-${TDAQ_VERSION}" )
set( TDAQ_ATROOT "$ENV{TDAQ_RELEASE_BASE}/${TDAQ_PROJECT_NAME}/${TDAQ_PROJECT_NAME}-${TDAQ_VERSION}" )
# Find the ATLAS CMake code:
find_package( AtlasCMake QUIET )
......@@ -42,7 +42,7 @@ foreach( _external ${_externals} )
include( ${_external} )
get_filename_component( _extName ${_external} NAME_WE )
string( TOUPPER ${_extName} _extNameUpper )
message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_ROOT}" )
message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" )
unset( _extName )
unset( _extNameUpper )
endforeach()
......@@ -91,13 +91,13 @@ install( FILES ${CMAKE_BINARY_DIR}/env_setup_install.sh
# Configure and install the post-configuration file:
string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}"
TDAQ-COMMON_ROOT "${TDAQ-COMMON_ROOT}" )
TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" )
string( REPLACE "${TDAQ-COMMON_VERSION}" "\${TDAQ-COMMON_VERSION}"
TDAQ-COMMON_ROOT "${TDAQ-COMMON_ROOT}" )
TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" )
string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}"
DQM-COMMON_ROOT "${DQM-COMMON_ROOT}" )
DQM-COMMON_ATROOT "${DQM-COMMON_ATROOT}" )
string( REPLACE "${DQM-COMMON_VERSION}" "\${DQM-COMMON_VERSION}"
DQM-COMMON_ROOT "${DQM-COMMON_ROOT}" )
DQM-COMMON_ATROOT "${DQM-COMMON_ATROOT}" )
configure_file( ${CMAKE_SOURCE_DIR}/PostConfig.cmake.in
${CMAKE_BINARY_DIR}/PostConfig.cmake @ONLY )
install( FILES ${CMAKE_BINARY_DIR}/PostConfig.cmake
......
......@@ -5,10 +5,10 @@
# Set the versions of the TDAQ projects:
set( TDAQ-COMMON_VERSION "@TDAQ-COMMON_VERSION@" )
set( TDAQ-COMMON_ROOT "@TDAQ-COMMON_ROOT@" )
set( TDAQ-COMMON_ATROOT "@TDAQ-COMMON_ATROOT@" )
set( DQM-COMMON_VERSION "@DQM-COMMON_VERSION@" )
set( DQM-COMMON_ROOT "@DQM-COMMON_ROOT@" )
set( DQM-COMMON_ATROOT "@DQM-COMMON_ATROOT@" )
# Find Gaudi:
find_package( Gaudi REQUIRED )
......@@ -35,7 +35,7 @@ foreach( _external ${_externals} )
get_filename_component( _extName ${_external} NAME_WE )
string( TOUPPER ${_extName} _extNameUpper )
if( NOT AtlasExternals_FIND_QUIETLY )
message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_ROOT}" )
message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" )
endif()
unset( _extName )
unset( _extNameUpper )
......
......@@ -3,5 +3,5 @@
#
set( CRMC_VERSION 1.5.4 )
set( CRMC_ROOT
set( CRMC_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_VERSION}/${LCG_PLATFORM} )
......@@ -3,5 +3,5 @@
#
set( EVTGEN_VERSION 1.6.0 )
set( EVTGEN_ROOT
set( EVTGEN_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/evtgen/${EVTGEN_VERSION}/${LCG_PLATFORM} )
......@@ -3,5 +3,5 @@
#
set( HEPUTILS_VERSION 1.1.0 )
set( HEPUTILS_ROOT
set( HEPUTILS_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_VERSION}/${LCG_PLATFORM} )
......@@ -3,5 +3,5 @@
#
set( HERWIG_VERSION 6.520.2 )
set( HERWIG_ROOT
set( HERWIG_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/herwig/${HERWIG_VERSION}/${LCG_PLATFORM} )
......@@ -3,5 +3,5 @@
#
set( HERWIG3_VERSION 7.1.5p1 )
set( HERWIG3_ROOT
set( HERWIG3_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/herwig++/${HERWIG3_VERSION}/${LCG_PLATFORM} )
......@@ -3,5 +3,5 @@
#
set( HYDJET_VERSION 1.6 )
set( HYDJET_ROOT
set( HYDJET_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/hydjet/${HYDJET_VERSION}/${LCG_PLATFORM} )
......@@ -3,5 +3,5 @@
#
set( LHAPDF_VERSION 6.2.1 )
set( LHAPDF_ROOT
set( LHAPDF_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/lhapdf/${LHAPDF_VERSION}/${LCG_PLATFORM} )
......@@ -3,5 +3,5 @@
#
set( MCUTILS_VERSION 1.2.1 )
set( MCUTILS_ROOT
set( MCUTILS_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_VERSION}/${LCG_PLATFORM} )
......@@ -3,5 +3,5 @@
#
set( MADGRAPH5AMC_VERSION 2.6.5p2.atlas3)
set( MADGRAPH5AMC_ROOT
set( MADGRAPH5AMC_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/madgraph5amc/${MADGRAPH5AMC_VERSION}/${LCG_PLATFORM} )
......@@ -3,5 +3,5 @@
#
set( PHOTOSPP_VERSION 3.61 )
set( PHOTOSPP_ROOT
set( PHOTOSPP_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_VERSION}/${LCG_PLATFORM} )
......@@ -3,5 +3,5 @@
#
set( PYTHIA6_VERSION 428.2 )
set( PYTHIA6_ROOT
set( PYTHIA6_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/pythia6/${PYTHIA6_VERSION}/${LCG_PLATFORM} )
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment