CMake: Restore rtos api and netsocket presence macro names

hugueskamba · hugueskamba · commit c82e8c233731 · 2020-11-06T17:25:22.000Z
The old tools rely on the old names to build
diff --git 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
@@ -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
@@ -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
@@ -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
 )

Original file line number	Diff line number	Diff line change
`@@ -29,3 +29,8 @@ target_sources(mbed-os PRIVATE`
`29`	`29`	`source/mbed_rtx_handlers.c`
`30`	`30`	`source/mbed_rtx_idle.cpp`
`31`	`31`	`)`
	`32`	`+`
	`33`	`+target_compile_definitions(mbed-os`
	`34`	`+ PUBLIC`
	`35`	`+ MBED_CONF_RTOS_PRESENT=1`
	`36`	`+)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ target_sources(mbed-os-netsocket`
`42`	`42`
`43`	`43`	`target_compile_definitions(mbed-os-netsocket`
`44`	`44`	`INTERFACE`
`45`		`- MBED_CONF_NETSOCKET_PRESENT=1`
	`45`	`+ MBED_CONF_NSAPI_PRESENT=1`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`target_link_libraries(mbed-os-netsocket`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ target_sources(mbed-os`
`23`	`23`
`24`	`24`	`target_compile_definitions(mbed-os`
`25`	`25`	`PUBLIC`
`26`		`- MBED_CONF_RTOS_PRESENT=1`
	`26`	`+ MBED_CONF_RTOS_API_PRESENT=1`
`27`	`27`	`)`