diff --git a/cmake_targets/tools/MODULES/Findxran.cmake b/cmake_targets/tools/MODULES/Findxran.cmake index efb6db13ea..5ef8748fea 100644 --- a/cmake_targets/tools/MODULES/Findxran.cmake +++ b/cmake_targets/tools/MODULES/Findxran.cmake @@ -4,9 +4,9 @@ # ------- # # Finds the xran library. Note that the library number is as follows: -# - oran_bronze_release_v1.1 -> 2.1.1 (B = second letter) -# - oran_e_maintenance_release_v1.0 -> 5.1.0 -# the version is currently hardcoded to 5.1.0 +# - oran_e_maintenance_release_v1.5 -> 5.1.6 +# - oran_f_release_v1.3 -> 6.1.4 +# - oran_k_release_v1.1 -> 11.1.1 # # Required options # ^^^^^^^^^^^^^^^^ @@ -88,6 +88,8 @@ if (xran_VERSION_STRING MATCHES "^oran_e_maintenance_release_v") string(REGEX REPLACE "oran_e_maintenance_release_v([0-9]+).([0-9]+)" "5.\\1.\\2" xran_VERSION ${xran_VERSION_STRING}) elseif(xran_VERSION_STRING MATCHES "^oran_f_release_v") string(REGEX REPLACE "oran_f_release_v([0-9]+).([0-9]+)" "6.\\1.\\2" xran_VERSION ${xran_VERSION_STRING}) +elseif(xran_VERSION_STRING MATCHES "^oran_k_release_v") + string(REGEX REPLACE "oran_k_release_v([0-9]+).([0-9]+)" "11.\\1.\\2" xran_VERSION ${xran_VERSION_STRING}) elseif(xran_VERSION_STRING MATCHES "^oran_bronze_release_v") string(REGEX REPLACE "oran_bronze_release_v([0-9]+).([0-9]+)" "2.\\1.\\2" xran_VERSION ${xran_VERSION_STRING}) else() diff --git a/radio/fhi_72/CMakeLists.txt b/radio/fhi_72/CMakeLists.txt index c9c51f7d80..9c77f6947e 100644 --- a/radio/fhi_72/CMakeLists.txt +++ b/radio/fhi_72/CMakeLists.txt @@ -19,14 +19,17 @@ add_library(oran_fhlib_5g MODULE ) set(F_VERSION 6.1.9) +set(K_VERSION 11.1.1) find_package(xran REQUIRED) if(xran_VERSION VERSION_GREATER_EQUAL 5 AND xran_VERSION VERSION_LESS 6) message(FATAL_ERROR "xran E release not supported starting from tag 2026.w08.\nPlease switch to F version ${F_VERSION}") elseif(xran_VERSION VERSION_EQUAL F_VERSION) target_compile_definitions(oran_fhlib_5g PRIVATE F_RELEASE) +elseif(xran_VERSION VERSION_EQUAL K_VERSION) + target_compile_definitions(oran_fhlib_5g PRIVATE K_RELEASE) else() - message(FATAL_ERROR "Found xran version ${xran_VERSION} but needed ${F_VERSION} (F release)") + message(FATAL_ERROR "Found xran version ${xran_VERSION} but needed ${F_VERSION} (F release) or ${K_VERSION} (K release)") endif() # Ignore xran-specific warning: we don't care/can't change the following warning, so suppress diff --git a/radio/fhi_72/mplane/CMakeLists.txt b/radio/fhi_72/mplane/CMakeLists.txt index b25402cfce..4ed91cfb7a 100644 --- a/radio/fhi_72/mplane/CMakeLists.txt +++ b/radio/fhi_72/mplane/CMakeLists.txt @@ -12,6 +12,8 @@ if(xran_VERSION MATCHES "5.*") message(FATAL_ERROR "xran E release not supported starting from tag 2026.w08.\nPlease switch to F version ${F_VERSION}") elseif(xran_VERSION VERSION_EQUAL F_VERSION) target_compile_definitions(oran_fhlib_5g_mplane PRIVATE F_RELEASE) +elseif(xran_VERSION VERSION_EQUAL K_VERSION) + target_compile_definitions(oran_fhlib_5g_mplane PRIVATE K_RELEASE) endif() # Ignore xran-specific warning: we don't care/can't change the following warning, so suppress