From 65d202b93b87a02ef68ae162ab8211177eb74679 Mon Sep 17 00:00:00 2001
From: Rajkumar Kanagaraj <rajkumar.kanagaraj@arm.com>
Date: Wed, 23 Jun 2021 07:41:22 -0700
Subject: [PATCH] CMake: unit-tests: Move mbed-headers-events to the events
 directory

Move the header-only mbed-headers-events library the unit test stubs
depend on into the events component directory. This makes the events
stubs more self-contained and improves the composition of the library.
---
 UNITTESTS/stubs/CMakeLists.txt                | 10 ----------
 events/tests/UNITTESTS/doubles/CMakeLists.txt | 11 +++++++++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
index dddc151af9..aeadeef118 100644
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@@ -5,7 +5,6 @@ add_library(mbed-stubs-headers INTERFACE)
 add_library(mbed-headers INTERFACE)
 add_library(mbed-headers-base INTERFACE)
 add_library(mbed-headers-connectivity INTERFACE)
-add_library(mbed-headers-events INTERFACE)
 
 target_link_libraries(mbed-headers
     INTERFACE
@@ -40,15 +39,6 @@ target_include_directories(mbed-headers-connectivity
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
 )
 
-target_include_directories(mbed-headers-events
-    INTERFACE
-        ${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h
-        ${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h/equeue
-        ${mbed-os_SOURCE_DIR}/events/include
-        ${mbed-os_SOURCE_DIR}/events/include/events
-        ${mbed-os_SOURCE_DIR}/events/include/events/internal
-)
-
 target_include_directories(mbed-headers
     INTERFACE
         ${mbed-os_SOURCE_DIR}/features
diff --git a/events/tests/UNITTESTS/doubles/CMakeLists.txt b/events/tests/UNITTESTS/doubles/CMakeLists.txt
index b7bf0eef80..34608ddef5 100644
--- a/events/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/events/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -1,6 +1,17 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-headers-events INTERFACE)
+
+target_include_directories(mbed-headers-events
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h
+        ${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h/equeue
+        ${mbed-os_SOURCE_DIR}/events/include
+        ${mbed-os_SOURCE_DIR}/events/include/events
+        ${mbed-os_SOURCE_DIR}/events/include/events/internal
+)
+
 add_library(mbed-stubs-events)
 
 target_sources(mbed-stubs-events