Merge branch 'MGControlFix-21.6.39-patches-20201102' into '21.6.39-patches'

MadGraphControl Fix, 21.6.39-patches branch (2020.11.02.)

See merge request atlas/athena!37830

Generators/MadGraphControl/CMakeLists.txt

@@ -7,17 +7,26 @@ atlas_subdir( MadGraphControl )
 
 # External dependencies:
 find_package( MadGraph )
+find_package( Boost )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.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
                        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( MadGraphControlEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
    CACHE PATH "Location of MadGraphControlEnvironment.cmake" )
 find_package( MadGraphControlEnvironment )
-
-

Generators/MadGraphControl/share/lhapdf-config → Generators/MadGraphControl/share/lhapdf-config.in

 #! /usr/bin/env bash
 ## -*- sh -*-
 ## 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
 
 prefix=
@@ -41,13 +41,13 @@ fi
 exec_prefix=${prefix}
 
 version=$LHAPDFVER
-if [ -z $version ] 
+if [ -z $version ]
 then
     version=$(echo "$prefix" | awk '{split($1,a,"lhapdf/"); split(a[2],b,"/");print b[1];}')
 fi
 
-#find boost 
-boost=$(find /cvmfs/atlas.cern.ch/repo/sw/software/21.6/sw/lcg/releases/Boost/*/*/* -type d -name "boost-*")
+#find boost
+boost=@Boost_INCLUDE_PATH@
 if [ -z $boost ]
 then
     echo "WARNING: lhapdf-config could not find boost headers"