Commit 45ebec0a authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

Taught MadGraphControl's lhapdf-config script to remember which version of Boost to use.

So that the script would would with non-CVMFS-based installations as well.
parent 0d6b0bb9
...@@ -7,17 +7,26 @@ atlas_subdir( MadGraphControl ) ...@@ -7,17 +7,26 @@ atlas_subdir( MadGraphControl )
# External dependencies: # External dependencies:
find_package( MadGraph ) find_package( MadGraph )
find_package( Boost )
# Install files from the package: # Install files from the package:
atlas_install_python_modules( python/*.py ) atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/common/*.py ) atlas_install_joboptions( share/common/*.py )
atlas_install_generic( share/file/*.dat share/lhapdf-config share/fastjet-config atlas_install_generic( share/file/*.dat share/fastjet-config
DESTINATION share DESTINATION share
EXECUTABLE ) EXECUTABLE )
# Set up and install the lhapdf-config script.
string( REPLACE "${LCG_RELEASE_BASE}" "\${LCG_RELEASE_BASE}"
Boost_INCLUDE_PATH "${Boost_INCLUDE_DIR}" )
configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/share/lhapdf-config.in"
"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/lhapdf-config" @ONLY )
atlas_install_generic(
"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/lhapdf-config"
DESTINATION "share"
EXECUTABLE )
# Set up the general runtime environment: # Set up the general runtime environment:
set( MadGraphControlEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR} set( MadGraphControlEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
CACHE PATH "Location of MadGraphControlEnvironment.cmake" ) CACHE PATH "Location of MadGraphControlEnvironment.cmake" )
find_package( MadGraphControlEnvironment ) find_package( MadGraphControlEnvironment )
#! /usr/bin/env bash #! /usr/bin/env bash
## -*- sh -*- ## -*- sh -*-
## lhapdf-config for MadGraph use in Athena ## lhapdf-config for MadGraph use in Athena
## this custom config is required to find both the lhapdf installation dir and the actual pdf set data from LHAPDF_DATA_PATH ## this custom config is required to find both the lhapdf installation dir and the actual pdf set data from LHAPDF_DATA_PATH
## in the default configuration the installation dir is hardcoded ## in the default configuration the installation dir is hardcoded
prefix= prefix=
...@@ -41,13 +41,13 @@ fi ...@@ -41,13 +41,13 @@ fi
exec_prefix=${prefix} exec_prefix=${prefix}
version=$LHAPDFVER version=$LHAPDFVER
if [ -z $version ] if [ -z $version ]
then then
version=$(echo "$prefix" | awk '{split($1,a,"lhapdf/"); split(a[2],b,"/");print b[1];}') version=$(echo "$prefix" | awk '{split($1,a,"lhapdf/"); split(a[2],b,"/");print b[1];}')
fi fi
#find boost #find boost
boost=$(find /cvmfs/atlas.cern.ch/repo/sw/software/21.6/sw/lcg/releases/Boost/*/*/* -type d -name "boost-*") boost=@Boost_INCLUDE_PATH@
if [ -z $boost ] if [ -z $boost ]
then then
echo "WARNING: lhapdf-config could not find boost headers" echo "WARNING: lhapdf-config could not find boost headers"
......
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