From c82e8c2337315a780b6e52b6f4f78cd41aae82be Mon Sep 17 00:00:00 2001
From: Hugues Kamba <hugues.kamba@arm.com>
Date: Fri, 16 Oct 2020 15:59:52 +0100
Subject: [PATCH] CMake: Restore rtos api and netsocket presence macro names

The old tools rely on the old names to build
---
 cmsis/device/rtos/CMakeLists.txt      | 5 +++++
 connectivity/netsocket/CMakeLists.txt | 2 +-
 mbed.h                                | 8 ++++----
 rtos/CMakeLists.txt                   | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/cmsis/device/rtos/CMakeLists.txt b/cmsis/device/rtos/CMakeLists.txt
index 3ade863e58..f5fe11ab5f 100644
--- a/cmsis/device/rtos/CMakeLists.txt
+++ b/cmsis/device/rtos/CMakeLists.txt
@@ -29,3 +29,8 @@ target_sources(mbed-os PRIVATE
     source/mbed_rtx_handlers.c
     source/mbed_rtx_idle.cpp
 )
+
+target_compile_definitions(mbed-os
+    PUBLIC
+        MBED_CONF_RTOS_PRESENT=1
+)
diff --git a/connectivity/netsocket/CMakeLists.txt b/connectivity/netsocket/CMakeLists.txt
index 647bdc3191..dd8475de26 100644
--- a/connectivity/netsocket/CMakeLists.txt
+++ b/connectivity/netsocket/CMakeLists.txt
@@ -42,7 +42,7 @@ target_sources(mbed-os-netsocket
 
 target_compile_definitions(mbed-os-netsocket
     INTERFACE
-        MBED_CONF_NETSOCKET_PRESENT=1
+        MBED_CONF_NSAPI_PRESENT=1
 )
 
 target_link_libraries(mbed-os-netsocket
diff --git a/mbed.h b/mbed.h
index cf41150904..8ed61789e5 100644
--- a/mbed.h
+++ b/mbed.h
@@ -19,20 +19,20 @@
 
 #include "platform/mbed_version.h"
 
-#if defined(MBED_CONF_RTOS_PRESENT)
+#if MBED_CONF_RTOS_API_PRESENT
 #include "rtos/rtos.h"
 #endif
 
-#if defined(MBED_CONF_NETSOCKET_PRESENT)
+#if MBED_CONF_NSAPI_PRESENT
 #include "netsocket/nsapi.h"
 #include "netsocket/nsapi_ppp.h"
 #endif
 
-#if defined(MBED_CONF_EVENTS_PRESENT)
+#if MBED_CONF_EVENTS_PRESENT
 #include "events/mbed_events.h"
 #endif
 
-#if defined(MBED_CONF_FILESYSTEM_PRESENT)
+#if MBED_CONF_FILESYSTEM_PRESENT
 #include "filesystem/mbed_filesystem.h"
 #endif
 
diff --git a/rtos/CMakeLists.txt b/rtos/CMakeLists.txt
index d713a8983b..8e367290f6 100644
--- a/rtos/CMakeLists.txt
+++ b/rtos/CMakeLists.txt
@@ -23,5 +23,5 @@ target_sources(mbed-os
 
 target_compile_definitions(mbed-os
     PUBLIC
-        MBED_CONF_RTOS_PRESENT=1
+        MBED_CONF_RTOS_API_PRESENT=1
 )