From efcc9fc9d4f66e19f4e1da1667acfcca905350c2 Mon Sep 17 00:00:00 2001
From: Teodora <teodora.vladic@openairinterface.org>
Date: Sat, 15 Feb 2025 17:13:30 +0100
Subject: [PATCH] Properly include xran_common.h in ${xran_INCLUDE_DIRS}

  - ${xran_LOCATION}/src/xran_common.h
  - delete unnecessary target_include_directories() from FHI72
---
 cmake_targets/tools/MODULES/Findxran.cmake | 10 ++++++----
 radio/fhi_72/CMakeLists.txt                |  3 ---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cmake_targets/tools/MODULES/Findxran.cmake b/cmake_targets/tools/MODULES/Findxran.cmake
index 290a782350..1ade3ac522 100644
--- a/cmake_targets/tools/MODULES/Findxran.cmake
+++ b/cmake_targets/tools/MODULES/Findxran.cmake
@@ -75,7 +75,6 @@ endif()
 
 find_path(xran_INCLUDE_DIR
   NAMES
-    xran_common.h
     xran_compression.h
     xran_cp_api.h
     xran_ecpri_owd_measurements.h
@@ -84,7 +83,7 @@ find_path(xran_INCLUDE_DIR
     xran_pkt_up.h
     xran_sync_api.h
   HINTS ${xran_LOCATION}
-  PATH_SUFFIXES api include
+  PATH_SUFFIXES api
   NO_DEFAULT_PATH
 )
 find_library(xran_LIBRARY
@@ -127,16 +126,19 @@ find_package_handle_standard_args(xran
   VERSION_VAR xran_VERSION
 )
 
+# in proper usage of cmake, include directory should only contain "api", but not header files under "src" directory;
+# however, we use xran_dev_get_ctx() and xran_dev_get_ctx_by_id() functions which are defined in xran_common.h;
+# since xran_common.h is under "src" directory, we have to include it in ${xran_INCLUDE_DIRS}
 if(xran_FOUND)
   set(xran_LIBRARIES ${xran_LIBRARY})
-  set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR})
+  set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR} ${xran_INCLUDE_DIR}/../src)
 endif()
 
 if(xran_FOUND AND NOT TARGET xran::xran)
   add_library(xran::xran UNKNOWN IMPORTED)
   set_target_properties(xran::xran PROPERTIES
     IMPORTED_LOCATION "${xran_LIBRARY}"
-    INTERFACE_INCLUDE_DIRECTORIES "${xran_INCLUDE_DIR}"
+    INTERFACE_INCLUDE_DIRECTORIES "${xran_INCLUDE_DIRS}"
   )
 endif()
 
diff --git a/radio/fhi_72/CMakeLists.txt b/radio/fhi_72/CMakeLists.txt
index 3fab4f5d47..dd31db27f2 100644
--- a/radio/fhi_72/CMakeLists.txt
+++ b/radio/fhi_72/CMakeLists.txt
@@ -36,9 +36,6 @@ target_include_directories(oran_fhlib_5g PRIVATE ${dpdk_INCLUDE_DIRS})
 target_link_libraries(oran_fhlib_5g PRIVATE pthread dl rt m numa)
 target_link_libraries(oran_fhlib_5g PRIVATE ${T_LIB})
 
-# TODO: can be removed?
-target_include_directories(oran_fhlib_5g PRIVATE ${xran_INCLUDE_DIRS}/../src/)
-
 add_boolean_option(OAI_FHI72_USE_POLLING OFF "Enable polling in FHI72 driver" ON)
 
 set_target_properties(oran_fhlib_5g PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})