maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly include xran_common.h in ${xran_INCLUDE_DIRS}

Browse Source 
- ${xran_LOCATION}/src/xran_common.h
  - delete unnecessary target_include_directories() from FHI72
This commit is contained in:
Teodora
2025-03-29 12:51:07 +01:00
parent 978fa2ed05
commit efcc9fc9d4
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_targets/tools/MODULES/Findxran.cmake
+6 -4
View File
@@ -75,7 +75,6 @@ endif()
find_path(xran_INCLUDE_DIR find_path(xran_INCLUDE_DIR
NAMES NAMES
xran_common.h
xran_compression.h xran_compression.h
xran_cp_api.h xran_cp_api.h
xran_ecpri_owd_measurements.h xran_ecpri_owd_measurements.h
@@ -84,7 +83,7 @@ find_path(xran_INCLUDE_DIR
xran_pkt_up.h xran_pkt_up.h
xran_sync_api.h xran_sync_api.h
HINTS ${xran_LOCATION} HINTS ${xran_LOCATION}
PATH_SUFFIXES api include PATH_SUFFIXES api
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
find_library(xran_LIBRARY find_library(xran_LIBRARY
@@ -127,16 +126,19 @@ find_package_handle_standard_args(xran
VERSION_VAR xran_VERSION 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) if(xran_FOUND)
set(xran_LIBRARIES ${xran_LIBRARY}) set(xran_LIBRARIES ${xran_LIBRARY})
set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR}) set(xran_INCLUDE_DIRS ${xran_INCLUDE_DIR} ${xran_INCLUDE_DIR}/../src)
endif() endif()
if(xran_FOUND AND NOT TARGET xran::xran) if(xran_FOUND AND NOT TARGET xran::xran)
add_library(xran::xran UNKNOWN IMPORTED) add_library(xran::xran UNKNOWN IMPORTED)
set_target_properties(xran::xran PROPERTIES set_target_properties(xran::xran PROPERTIES
IMPORTED_LOCATION "${xran_LIBRARY}" IMPORTED_LOCATION "${xran_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${xran_INCLUDE_DIR}" INTERFACE_INCLUDE_DIRECTORIES "${xran_INCLUDE_DIRS}"
) )
endif() endif()
radio/fhi_72/CMakeLists.txt
-3
View File
@@ -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 pthread dl rt m numa)
target_link_libraries(oran_fhlib_5g PRIVATE ${T_LIB}) 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) 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}) set_target_properties(oran_fhlib_5g PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})