From 04477f7307b5516214f5e00af6166d903b58a40e Mon Sep 17 00:00:00 2001 From: Mirko Covizzi Date: Tue, 2 Apr 2024 10:57:29 +0200 Subject: [PATCH] nrf_modem: update for upmerge todo message Signed-off-by: Mirko Covizzi --- nrf_modem/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nrf_modem/CMakeLists.txt b/nrf_modem/CMakeLists.txt index 819d676017..bae70fa1a7 100644 --- a/nrf_modem/CMakeLists.txt +++ b/nrf_modem/CMakeLists.txt @@ -6,10 +6,10 @@ if(CONFIG_NRF_MODEM_LINK_BINARY) - string(REGEX REPLACE "_[a-zA-Z][a-zA-Z][a-zA-Z][a-zA-Z]$" "" arch_soc_dir ${CONFIG_SOC}) + string(REPLACE "nrf" "nRF" arch_soc_dir ${CONFIG_SOC}) - if(NOT arch_soc_dir MATCHES "nRF9160") - string(REGEX REPLACE "nRF91[0-9]*" "nRF9120" arch_soc_dir ${arch_soc_dir}) + if(NOT arch_soc_dir MATCHES "^nRF9160$" AND NOT arch_soc_dir MATCHES "^nRF9120$") + message(FATAL_ERROR "Unknown SOC. Expected ('nRF9160'|'nRF9120') got '${CONFIG_SOC}'.") endif() if(CONFIG_FPU)