From b87be44726e7232789a35a1fa9d6fdedddc7dfb0 Mon Sep 17 00:00:00 2001 From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch> Date: Fri, 6 Mar 2015 11:56:15 +0100 Subject: [PATCH] cmt/requirements: fix compilation problem probably due to system rpms update (ByteStreamStoragePlugins-00-00-34) 2015-03-06 Emil Obreshkov <obreshko@cern.ch> * cmt/requirements: fix compilation problem probably due to system rpms update * Tag as ByteStreamStoragePlugins-00-00-34 2014-11-08 David Quarrie <David.Quarrie@cern.ch> * Tagged as ByteStreamStoragePlugins-00-00-33 --- Event/ByteStreamStoragePlugins/cmt/requirements | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Event/ByteStreamStoragePlugins/cmt/requirements b/Event/ByteStreamStoragePlugins/cmt/requirements index ba0c2d7a5b1..0c7e2869f1e 100755 --- a/Event/ByteStreamStoragePlugins/cmt/requirements +++ b/Event/ByteStreamStoragePlugins/cmt/requirements @@ -19,6 +19,9 @@ apply_pattern cmake_add_command command="find_package(CASTOR COMPONENTS rfio)" # Specify to cmake that this package depends on Xrootd. Transparent to CMT apply_pattern cmake_add_command command="find_package(Xrootd COMPONENTS Posix)" +# Specify to cmake that it should ignore the -import=AtlasDCACHE for the fReaddCache library +apply_pattern cmake_ignore_import library=fReaddCache import=AtlasDCACHE + include_path none # Castor plugin @@ -42,9 +45,6 @@ macro fReadXRootD_shlibflags "$(xrootd_linkopts) -lXrdPosixPreload -rdynamic $( # dCache plugin -# Specify to cmake that the AtlasDCACHE import should be ignored. Transparent to CMT -apply_pattern cmake_ignore_import library=fReaddCache import=AtlasDCACHE - macro dCacheLibFiles "fReaddCache.cxx" library fReaddCache $(dCacheLibFiles) -import=AtlasDCACHE apply_pattern named_linked_library library="fReaddCache" @@ -54,6 +54,8 @@ macro fReaddCache_shlibflags "$(dcache_client_linkopts) -rdynamic $(tdaqc_linko private +macro_append includes " -I/usr/include/shift " + apply_tag allowUndefined macro use_Shift "" \ -- GitLab