resolve rebase conflicts

paul-szczepanek-arm · Jul 2, 2021 · 939922e · 939922e
1 parent 8e0c49d
commit 939922e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 26 deletions.
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -7,6 +7,7 @@ add_library(mbed-headers-base INTERFACE)
 add_library(mbed-headers-platform INTERFACE)
 add_library(mbed-headers-connectivity INTERFACE)
 add_library(mbed-headers-storage INTERFACE)
+add_library(mbed-headers-drivers INTERFACE)
 add_library(mbed-headers-hal INTERFACE)
 add_library(mbed-headers-events INTERFACE)
 add_library(mbed-headers-rtos INTERFACE)
@@ -86,6 +87,13 @@ target_include_directories(mbed-headers-connectivity
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
 )
 
+target_include_directories(mbed-headers-drivers
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/drivers
+        ${mbed-os_SOURCE_DIR}/drivers/include
+        ${mbed-os_SOURCE_DIR}/drivers/include/drivers
+)
+
 target_include_directories(mbed-headers-events
     INTERFACE
         ${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h
@@ -120,6 +128,7 @@ target_include_directories(mbed-stubs-headers
 )
 
 add_subdirectory(connectivity)
+add_subdirectory(drivers)
 add_subdirectory(events)
 add_subdirectory(hal)
 add_subdirectory(platform)

diff --git a/connectivity/lorawan/mbed_lib.json b/connectivity/lorawan/mbed_lib.json
@@ -189,7 +189,7 @@
     "target_overrides": {
         "STM32WL": {
             "wakeup-time": 3,
-            "max-sys-rx-error": 10,
+            "max-sys-rx-error": 10
         }
     }
 }
diff --git a/drivers/tests/UNITTESTS/CMakeLists.txt b/drivers/tests/UNITTESTS/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
-add_subdirectory(doubles)
+
 add_subdirectory(PwmOut)
 add_subdirectory(Watchdog)
diff --git a/drivers/tests/UNITTESTS/PwmOut/CMakeLists.txt b/drivers/tests/UNITTESTS/PwmOut/CMakeLists.txt
@@ -18,10 +18,7 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
-        mbed-headers-platform
-        mbed-headers-hal
-        mbed-headers-drivers
+        mbed-headers
         mbed-stubs-hal
         mbed-stubs-platform
         gmock_main

diff --git a/drivers/tests/UNITTESTS/Watchdog/CMakeLists.txt b/drivers/tests/UNITTESTS/Watchdog/CMakeLists.txt
@@ -19,10 +19,7 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
-        mbed-headers-hal
-        mbed-headers-drivers
-        mbed-headers-platform
+        mbed-headers
         mbed-stubs-platform
         mbed-stubs-hal
         gmock_main

diff --git a/drivers/tests/UNITTESTS/doubles/CMakeLists.txt b/drivers/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -1,15 +1,6 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-headers-drivers INTERFACE)
-
-target_include_directories(mbed-headers-drivers
-    INTERFACE
-        ${mbed-os_SOURCE_DIR}/drivers
-        ${mbed-os_SOURCE_DIR}/drivers/include
-        ${mbed-os_SOURCE_DIR}/drivers/include/drivers
-)
-
 add_library(mbed-stubs-drivers)
 
 target_sources(mbed-stubs-drivers
@@ -27,8 +18,6 @@ target_compile_definitions(mbed-stubs-drivers
 
 target_link_libraries(mbed-stubs-drivers
     PRIVATE
-        mbed-headers-base
-        mbed-headers-hal
-        mbed-headers-drivers
-        mbed-headers-platform
+        mbed-headers
+        mbed-stubs-headers
 )
diff --git a/events/tests/UNITTESTS/equeue/CMakeLists.txt b/events/tests/UNITTESTS/equeue/CMakeLists.txt
@@ -23,9 +23,7 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
-        mbed-headers-platform
-        mbed-headers-events
+        mbed-headers
         mbed-stubs-events
         mbed-stubs-platform
         gmock_main