39ef4b7110
Fail gracefully in case of unsupported extended file attributes Avoid null bytes in error message strings Fix include path in XRootDConfig.cmake Avoid dereferencing unaligned pointers Support big endian in XrdZip
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
From ccedaabc377e668280eec8bb22f0dbb76550beec Mon Sep 17 00:00:00 2001
|
|
From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
|
|
Date: Mon, 4 Dec 2023 11:52:44 +0100
|
|
Subject: [PATCH 2/2] [CMake] Fix include path in XRootDConfig.cmake
|
|
|
|
Headers are installed into the subdirectory xrootd/. This was broken
|
|
with commit c6e0e598ce ("[CMake] Find only XRootD matching
|
|
XRootDConfig.cmake installation path") released with version 5.6.3.
|
|
---
|
|
cmake/XRootDConfig.cmake.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cmake/XRootDConfig.cmake.in b/cmake/XRootDConfig.cmake.in
|
|
index 0f95a8f54..0a4ce3fe5 100644
|
|
--- a/cmake/XRootDConfig.cmake.in
|
|
+++ b/cmake/XRootDConfig.cmake.in
|
|
@@ -50,7 +50,7 @@ SET( XROOTD_SSI_FOUND FALSE )
|
|
|
|
set_and_check(XRootD_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}")
|
|
set_and_check(XRootD_DATA_DIR "@PACKAGE_CMAKE_INSTALL_DATADIR@")
|
|
-set_and_check(XRootD_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
|
|
+set_and_check(XRootD_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/xrootd")
|
|
set_and_check(XRootD_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
|
|
|
|
set(XRootD_INCLUDE_DIRS "${XRootD_INCLUDE_DIR};${XRootD_INCLUDE_DIR}/private")
|
|
--
|
|
2.43.0
|
|
|