From 7e8706b21dc62fc7b56709cf03c2650c715e5b64 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Wed, 19 Aug 2020 20:23:15 +0200
Subject: [PATCH] When building ROOT's libGFAL using gfal2, srm-ifce is not a
 build dependency.

---
 cmake/modules/FindGFAL.cmake | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/cmake/modules/FindGFAL.cmake b/cmake/modules/FindGFAL.cmake
index 71163a1714..74028ac5a7 100644
--- a/cmake/modules/FindGFAL.cmake
+++ b/cmake/modules/FindGFAL.cmake
@@ -17,22 +17,26 @@ find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h
           HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include)
 find_library(GFAL_LIBRARY NAMES gfal gfal2
              HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib)
-find_path(SRM_IFCE_INCLUDE_DIR  gfal_srm_ifce_types.h 
-          HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include)
 
 set(GFAL_LIBRARIES ${GFAL_LIBRARY})
-set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR})
+set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR})
 
 if(GFAL_LIBRARY MATCHES gfal2)
   # use pkg-config to get the directories for glib and then use these values
   find_package(PkgConfig)
   pkg_check_modules(GLIB2 REQUIRED glib-2.0)
   list(APPEND GFAL_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS})
+  set(GFAL_DEP GLIB2_INCLUDE_DIRS)
+else()
+  find_path(SRM_IFCE_INCLUDE_DIR gfal_srm_ifce_types.h 
+            HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include)
+  list(APPEND GFAL_INCLUDE_DIRS ${SRM_IFCE_INCLUDE_DIR})
+  set(GFAL_DEP SRM_IFCE_INCLUDE_DIR)
 endif()
 
 # handle the QUIETLY and REQUIRED arguments and set GFAL_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GFAL_LIBRARY)
+find_package_handle_standard_args(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR ${GFAL_DEP} GFAL_LIBRARY)
 
-mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARY SRM_IFCE_INCLUDE_DIR GLIB_INCLUDE_DIR)
+mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARY SRM_IFCE_INCLUDE_DIR GLIB2_INCLUDE_DIRS)
-- 
2.26.2