From 8250780ed380e2a0dd372016b64b5dd8a746454f Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <krasznaa@cern.ch>
Date: Thu, 10 Nov 2016 12:40:54 +0100
Subject: [PATCH] Fixing FindCASTOR.cmake for LCG_86 (AtlasLCG-00-00-75)
* Updated FindCASTOR.cmake to be compatible with LCG_86. As well
as the older LCG releases.
* Tagging as AtlasLCG-00-00-75
2016-11-08 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
* Taught FindLhapdf.cmake to set the environment variables
correctly even when LHAPDF was compiled as part of a base
project, and is not taken from LCG.
* Tagging as AtlasLCG-00-00-74
---
Build/AtlasLCG/modules/FindCASTOR.cmake | 6 +++---
Build/AtlasLCG/modules/FindLhapdf.cmake | 15 ++++++++++-----
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Build/AtlasLCG/modules/FindCASTOR.cmake b/Build/AtlasLCG/modules/FindCASTOR.cmake
index 8e66a04aab1..35ef4bb71ee 100644
--- a/Build/AtlasLCG/modules/FindCASTOR.cmake
+++ b/Build/AtlasLCG/modules/FindCASTOR.cmake
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# $Id: FindCASTOR.cmake 718732 2016-01-20 12:30:12Z krasznaa $
+# $Id: FindCASTOR.cmake 783446 2016-11-10 12:40:34Z krasznaa $
#
# - Locate CASTOR libraries
# Defines:
@@ -21,7 +21,7 @@ include( LCGFunctions )
# Declare the external module:
lcg_external_module( NAME CASTOR
- INCLUDE_SUFFIXES usr/include INCLUDE_NAMES shift.h
+ INCLUDE_SUFFIXES include usr/include INCLUDE_NAMES shift.h
EXTRA_OPTIONS NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH )
# Reset the library lists:
@@ -45,7 +45,7 @@ foreach( component ${CASTOR_FIND_COMPONENTS} )
# The the requested library:
find_library( _CASTOR_${component}_library NAMES ${name}
- PATH_SUFFIXES usr/lib64 PATHS ${CASTOR_ROOT}
+ PATH_SUFFIXES lib lib64 usr/lib usr/lib64 PATHS ${CASTOR_ROOT}
EXTRA_OPTIONS NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH )
if( _CASTOR_${component}_library )
set( CASTOR_${component}_FOUND TRUE )
diff --git a/Build/AtlasLCG/modules/FindLhapdf.cmake b/Build/AtlasLCG/modules/FindLhapdf.cmake
index 12ff834a47c..f14d10a5028 100644
--- a/Build/AtlasLCG/modules/FindLhapdf.cmake
+++ b/Build/AtlasLCG/modules/FindLhapdf.cmake
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# $Id: FindLhapdf.cmake 723149 2016-02-10 16:26:22Z krasznaa $
+# $Id: FindLhapdf.cmake 782981 2016-11-08 14:05:34Z krasznaa $
#
# Module finding Lhapdf in the LCG release. Defines:
# - LHAPDF_FOUND
@@ -21,19 +21,24 @@ lcg_external_module( NAME Lhapdf
LIBRARY_SUFFIXES lib
COMPULSORY_COMPONENTS LHAPDF )
+# Find the LHAPDF data directory:
+find_path( LHAPDF_DATA_PATH NAMES lhapdf.conf
+ PATHS ${LHAPDF_ROOT}
+ PATH_SUFFIXES share/LHAPDF )
+
# Handle the standard find_package arguments:
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( Lhapdf DEFAULT_MSG LHAPDF_INCLUDE_DIR
- LHAPDF_LIBRARIES )
+ LHAPDF_LIBRARIES LHAPDF_DATA_PATH )
mark_as_advanced( LHAPDF_FOUND LHAPDF_INCLUDE_DIR LHAPDF_INCLUDE_DIRS
- LHAPDF_LIBRARIES LHAPDF_LIBRARY_DIRS )
+ LHAPDF_LIBRARIES LHAPDF_LIBRARY_DIRS LHAPDF_DATA_PATH )
# Environment settings:
set( LHAPDF_ENVIRONMENT
- APPEND LHAPDF_DATA_PATH ${LHAPDF_ROOT}/share/LHAPDF
+ APPEND LHAPDF_DATA_PATH ${LHAPDF_DATA_PATH}
APPEND LHAPDF_DATA_PATH
/cvmfs/atlas.cern.ch/repo/sw/Generators/lhapdfsets/current
- APPEND LHAPATH ${LHAPDF_ROOT}/share/LHAPDF
+ APPEND LHAPATH ${LHAPDF_DATA_PATH}
APPEND LHAPATH
/cvmfs/atlas.cern.ch/repo/sw/Generators/lhapdfsets/current )
--
GitLab