Commit a0dfa943 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'CrmcCompUpdate-master-20211112' into 'master'

Crmc Compatibility Update, master branch (2021.11.12.)

See merge request atlas/athena!48209
parents aee56f36 319ffc7b
......@@ -7,14 +7,6 @@ atlas_subdir( Epos_i )
find_package( CLHEP )
find_package( Crmc COMPONENTS Epos )
if ("${CRMC_LCGVERSION}" MATCHES "^1")
message( INFO "VERSION 1.xx ${CRMC_LCGVERSION}" )
set( CRMC_TABS ${CRMC_LCGROOT}/tabs )
else()
message( INFO "VERSION 2.xx ${CRMC_LCGVERSION}" )
set( CRMC_TABS ${CRMC_LCGROOT}/share/crmc )
endif()
# Remove the --as-needed linker flags:
atlas_disable_as_needed()
......@@ -37,17 +29,23 @@ 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_TABS}/dpmjet.dat
${CRMC_TABS}/epos.initl
${CRMC_TABS}/epos.iniev
${CRMC_TABS}/epos.inirj
${CRMC_TABS}/epos.inirj.lhc
${CRMC_TABS}/epos.inics
${CRMC_TABS}/epos.inics.lhc
${CRMC_TABS}/epos.inidi )
atlas_install_runtime( share/file/epos_crmc.param )
# Install files from Crmc.
foreach( _file "epos.initl" "epos.iniev" "epos.inirj" "epos.inirj.lhc"
"epos.inics" "epos.inics.lhc" "epos.inidi" )
find_file( _datFile "${_file}"
PATHS "${CRMC_LCGROOT}"
PATH_SUFFIXES "tabs" "share/crmc"
NO_CACHE )
if( _datFile )
atlas_install_runtime( "${_datFile}" )
else()
message( WARNING "Could not find data file \"${_file}\"" )
endif()
endforeach()
# Set up the runtime environment for the package.
set( EposEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
CACHE PATH "Location of EposEnvironment.cmake" )
find_package( EposEnvironment )
......@@ -18,24 +18,33 @@ atlas_add_library( QGSJet_iLib
src/Rangen.F
PUBLIC_HEADERS QGSJet_i
INCLUDE_DIRS ${CRMC_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${CRMC_LIBRARIES} GeneratorModulesLib
PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib AtlasHepMCfioLib AthenaKernel GaudiKernel TruthUtils )
atlas_add_component( QGSJet_i
src/components/*.cxx
INCLUDE_DIRS ${CRMC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
INCLUDE_DIRS ${CRMC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${CRMC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AtlasHepMCfioLib GeneratorModulesLib AthenaKernel GaudiKernel TruthUtils QGSJet_iLib )
# Install files from the package:
# atlas_install_joboptions( share/common/*.py )
atlas_install_runtime( share/file/qgsjet_crmc.param )
atlas_install_runtime( ${CRMC_LCGROOT}/tabs/sectnu-II-04
${CRMC_LCGROOT}/tabs/qgsdat-II-04.lzma )
# Install files from Crmc.
foreach( _file "sectnu-II-04" "qgsdat-II-04.lzma" )
find_file( _datFile "${_file}"
PATHS "${CRMC_LCGROOT}"
PATH_SUFFIXES "tabs" "share/crmc"
NO_CACHE )
if( _datFile )
atlas_install_runtime( "${_datFile}" )
else()
message( WARNING "Could not find data file \"${_file}\"" )
endif()
endforeach()
# Set up the runtime environment for the package.
set( QGSJetEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
CACHE PATH "Location of QGSJetEnvironment.cmake" )
find_package( QGSJetEnvironment )
Markdown is supported
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