From 98e278b0d5f5b166e58396b200f9e9c3fbac31ab Mon Sep 17 00:00:00 2001 From: Laurent THOMAS Date: Fri, 26 Dec 2025 14:00:53 +0100 Subject: [PATCH] Correctly include cblas include directories RHEL uses a dedicated cblas include directory. Correctly include this for the one target PHY_UE that relies on this. Co-authored-by: Robert Schmidt --- CMakeLists.txt | 6 +++--- openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70ea409d36..c3d8624d86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1038,11 +1038,11 @@ pkg_check_modules(lapacke REQUIRED lapacke) add_library(PHY_UE ${PHY_SRC_UE}) target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL) -# RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` will -# be empty for Ubuntu, a no-op +# RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` and +# `cblas_INCLUDE_DIRS` will be empty for Ubuntu, a no-op pkg_check_modules(cblas cblas) target_link_libraries(PHY_UE PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES}) -target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS}) +target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${cblas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS}) add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON}) target_link_libraries(PHY_NR_COMMON PUBLIC UTIL) diff --git a/openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c b/openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c index 998b95d0d3..86a4b93ddd 100644 --- a/openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c +++ b/openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c @@ -12,11 +12,7 @@ data storage. */ #include #include #include -#if defined RHEL_RELEASE_CODE -#include -#else #include -#endif #include #include #include