From 73a1a7a2ae91ab8a3551f34796bc5d8278fdb5c9 Mon Sep 17 00:00:00 2001
From: Juan Miguel Carceller <jmcarcell@users.noreply.github.com>
Date: Sun, 18 Jan 2026 21:42:31 +0100
Subject: [PATCH] Check for the Config.cmake and LibDeps.cmake in lib/cmake
 first

before the root installation folder. This change works with the
existing version of iLCUtil and also with a future change where
the Config files are installed to lib/cmake instead of the root of the
installation folder. See https://github.com/iLCSoft/iLCUtil/pull/36
---
 cmake/AIDAConfig.cmake.in  | 6 +++++-
 cmake/RAIDAConfig.cmake.in | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cmake/AIDAConfig.cmake.in b/cmake/AIDAConfig.cmake.in
index 3849fbc..fb9687b 100644
--- a/cmake/AIDAConfig.cmake.in
+++ b/cmake/AIDAConfig.cmake.in
@@ -3,7 +3,11 @@
 # @author Jan Engels, Desy
 ##############################################################################
 
-INCLUDE( "@CMAKE_INSTALL_PREFIX@/RAIDAConfig.cmake" )
+
+INCLUDE( "@CMAKE_INSTALL_PREFIX@/lib/cmake/RAIDA/RAIDAConfig.cmake" OPTIONAL RESULT_VARIABLE RAIDA_CONFIG_INCLUDED )
+IF( RAIDA_CONFIG_INCLUDED STREQUAL "NOTFOUND" )
+  INCLUDE( "@CMAKE_INSTALL_PREFIX@/RAIDAConfig.cmake" )
+ENDIF()
 
 SET( AIDA_FOUND ${RAIDA_FOUND} )
 
diff --git a/cmake/RAIDAConfig.cmake.in b/cmake/RAIDAConfig.cmake.in
index e86c549..9150b23 100644
--- a/cmake/RAIDAConfig.cmake.in
+++ b/cmake/RAIDAConfig.cmake.in
@@ -53,7 +53,10 @@ CHECK_PACKAGE_LIBS( RAIDA RAIDA )
 
 # ---------- libraries dependencies -------------------------------------------
 # this sets RAIDA_${COMPONENT}_LIB_DEPENDS variables
-INCLUDE( "${RAIDA_ROOT}/lib/cmake/RAIDALibDeps.cmake" )
+INCLUDE( "${RAIDA_ROOT}/lib/cmake/RAIDA/RAIDALibDeps.cmake" OPTIONAL RESULT_VARIABLE RAIDA_LIBDEPS_INCLUDED )
+IF( RAIDA_LIBDEPS_INCLUDED STREQUAL "NOTFOUND" )
+    INCLUDE( "${RAIDA_ROOT}/lib/cmake/RAIDALibDeps.cmake" )
+ENDIF()