Fix event queue being stuck in non-RTOS mode, causing all sorts of weird behavior

connectivity/FEATURE_BLE/source/cordio/TESTS/cordio_hci/driver/CMakeLists.txt

@@ -8,5 +8,4 @@ mbed_greentea_add_test(
         main.cpp
     TEST_REQUIRED_LIBS
         mbed-ble
-        mbed-events
 )

connectivity/libraries/ppp/CMakeLists.txt

@@ -55,7 +55,6 @@ target_compile_definitions(mbed-ppp
 
 target_link_libraries(mbed-ppp
     PUBLIC
-        mbed-events
         mbed-netsocket-api
     PRIVATE
         mbed-rtos-flags

connectivity/lorawan/CMakeLists.txt

@@ -35,6 +35,5 @@ target_compile_definitions(mbed-lorawan
 
 target_link_libraries(mbed-lorawan
     PUBLIC
-        mbed-events
         mbed-mbedtls
 )

connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt

@@ -27,7 +27,6 @@ target_link_libraries(mbed-nanostack-hal_mbed_cmsis_rtos
         mbed-core-flags
         mbed-randlib
         mbed-nanostack-sal_stack-event_loop
-        mbed-events
         mbed-nanostack-libservice
         mbed-nanostack-sal_stack
     PRIVATE

connectivity/netsocket/CMakeLists.txt

@@ -53,7 +53,6 @@ target_link_libraries(mbed-netsocket-api
     PUBLIC
         mbed-core-flags
         mbed-mbedtls
-        mbed-events
 )
 
 add_library(mbed-netsocket INTERFACE)

connectivity/nfc/CMakeLists.txt

@@ -46,9 +46,4 @@ target_sources(mbed-nfc
 target_compile_definitions(mbed-nfc
     PUBLIC
         MBED_CONF_NFC_PRESENT=1
-)
-
-target_link_libraries(mbed-nfc
-    PUBLIC
-        mbed-events
-)
+)

events/CMakeLists.txt

@@ -9,31 +9,26 @@ if(MBED_ENABLE_OS_INTERNAL_TESTS)
     endif()
 endif()
 
-add_library(mbed-events STATIC EXCLUDE_FROM_ALL)
-
-target_include_directories(mbed-events
-    PUBLIC
+# Note: The event queue library gets a different implementation when the RTOS is or is not included.
+# So, we add it to the core Mbed lib so that it will be built once for each Mbed version.
+target_include_directories(mbed-core-flags
+    INTERFACE
         .
         ./include
         ./include/events
         ./include/events/internal
 )
 
-target_sources(mbed-events
-    PRIVATE
+target_compile_definitions(mbed-core-flags
+    INTERFACE
+        MBED_CONF_EVENTS_PRESENT=1
+)
+
+target_sources(mbed-core-sources
+    INTERFACE
         source/EventQueue.cpp
         source/equeue.c
         source/equeue_mbed.cpp
         source/equeue_posix.c
         source/mbed_shared_queues.cpp
-)
-
-target_compile_definitions(mbed-events
-    PUBLIC
-        MBED_CONF_EVENTS_PRESENT=1
-)
-
-target_link_libraries(mbed-events
-    PUBLIC
-        mbed-core-flags
 )

events/tests/TESTS/events/equeue/CMakeLists.txt

@@ -15,6 +15,4 @@ mbed_greentea_add_test(
         ${TEST_TARGET}
     TEST_SOURCES
         main.cpp
-    TEST_REQUIRED_LIBS
-        mbed-events
 )

events/tests/TESTS/events/queue/CMakeLists.txt

@@ -15,6 +15,4 @@ mbed_greentea_add_test(
         ${TEST_TARGET}
     TEST_SOURCES
         main.cpp
-    TEST_REQUIRED_LIBS
-        mbed-events
 )

events/tests/TESTS/events/timing/CMakeLists.txt

@@ -15,6 +15,4 @@ mbed_greentea_add_test(
         ${TEST_TARGET}
     TEST_SOURCES
         main.cpp
-    TEST_REQUIRED_LIBS
-        mbed-events
 )