From 513f0beb37539d0887915f4400a4ef280c32c3c6 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 20 Sep 2024 15:14:58 +0200 Subject: [PATCH] Parse xran version strings for Bronze, E, F --- cmake_targets/tools/MODULES/Findxran.cmake | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/cmake_targets/tools/MODULES/Findxran.cmake b/cmake_targets/tools/MODULES/Findxran.cmake index 961efc4e38..39f0ffeb75 100644 --- a/cmake_targets/tools/MODULES/Findxran.cmake +++ b/cmake_targets/tools/MODULES/Findxran.cmake @@ -101,17 +101,16 @@ endif() file(STRINGS ${xran_VERSION_FILE} xran_VERSION_LINE REGEX "^#define[ \t]+VERSIONX[ \t]+\"[a-z_.0-9]+\"$") string(REGEX REPLACE "^#define[ \t]+VERSIONX[ \t]+\"([a-z_.0-9]+)\"$" "\\1" xran_VERSION_STRING "${xran_VERSION_LINE}") -message(STATUS "Found xran release ${xran_VERSION_STRING}") -set(xran_VERSION "NOTFOUND") -if (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.0") - set(xran_VERSION 5.1.0) -elseif (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.1") - set(xran_VERSION 5.1.1) -elseif (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.2") - set(xran_VERSION 5.1.2) -elseif (xran_VERSION_STRING STREQUAL "oran_e_maintenance_release_v1.3") - set(xran_VERSION 5.1.3) +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_bronze_release_v") + string(REGEX REPLACE "oran_bronze_release_v([0-9]+).([0-9]+)" "2.\\1.\\2" xran_VERSION ${xran_VERSION_STRING}) +else() + message(FATAL_ERROR "unrecognized xran version string: ${xran_VERSION_STRING}") endif() +message(STATUS "Found xran release ${xran_VERSION_STRING} (v${xran_VERSION})") unset(xran_VERSION_LINE) unset(xran_VERSION_STRING) unset(xran_VERSION_FILE)