Merge remote-tracking branch 'origin/change-method-cblas-variant' into integration_2026_w02 (!3835)

Correctly include cblas include directories for RHEL

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)

openair1/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c

@@ -12,11 +12,7 @@ data storage. */
 #include<complex.h>
 #include <stdlib.h>
 #include <linux/version.h>
-#if defined RHEL_RELEASE_CODE
-#include <cblas/cblas.h>
-#else
 #include <cblas.h>
-#endif
 #include <string.h>
 #include <linux/version.h>
 #include <lapacke_utils.h>