diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83a04f2..e8c420b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,18 +147,10 @@
 add_subdirectory(hal)
 add_subdirectory(platform)
 add_subdirectory(rtos)
-
-if(${CMAKE_CROSSCOMPILING})
-    add_subdirectory(targets)
-    # The directories below contain optional target libraries
-    add_subdirectory(connectivity EXCLUDE_FROM_ALL)
-    add_subdirectory(storage EXCLUDE_FROM_ALL)
-    add_subdirectory(events EXCLUDE_FROM_ALL)
-else()
-    add_subdirectory(connectivity)
-    add_subdirectory(storage)
-    add_subdirectory(events)
-endif()
+add_subdirectory(targets)
+add_subdirectory(storage)
+add_subdirectory(events)
+add_subdirectory(connectivity)
 
 # The directories below contain optional target libraries
 add_subdirectory(drivers/device_key EXCLUDE_FROM_ALL)
diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
index 985cdb8..e011ad2 100644
--- a/connectivity/CMakeLists.txt
+++ b/connectivity/CMakeLists.txt
@@ -24,14 +24,21 @@
 add_library(mbed-ppp INTERFACE)
 add_library(mbed-wifi INTERFACE)
 
-
-add_subdirectory(FEATURE_BLE)
-add_subdirectory(cellular)
-add_subdirectory(drivers)
-add_subdirectory(libraries)
-add_subdirectory(lorawan)
-add_subdirectory(lwipstack)
-add_subdirectory(mbedtls)
-add_subdirectory(nanostack)
-add_subdirectory(netsocket)
-add_subdirectory(nfc)
+if(${CMAKE_CROSSCOMPILING})
+    # The directories below contain optional target libraries
+    add_subdirectory(FEATURE_BLE EXCLUDE_FROM_ALL)
+    add_subdirectory(cellular EXCLUDE_FROM_ALL)
+    add_subdirectory(drivers EXCLUDE_FROM_ALL)
+    add_subdirectory(libraries EXCLUDE_FROM_ALL)
+    add_subdirectory(lorawan EXCLUDE_FROM_ALL)
+    add_subdirectory(lwipstack EXCLUDE_FROM_ALL)
+    add_subdirectory(mbedtls EXCLUDE_FROM_ALL)
+    add_subdirectory(nanostack EXCLUDE_FROM_ALL)
+    add_subdirectory(netsocket EXCLUDE_FROM_ALL)
+    add_subdirectory(nfc EXCLUDE_FROM_ALL)
+else()
+    # Add these subdirectories for the Unit test
+    add_subdirectory(cellular)
+    add_subdirectory(lorawan)
+    add_subdirectory(netsocket)
+endif()
diff --git a/events/CMakeLists.txt b/events/CMakeLists.txt
index 061c23c..1cda315 100644
--- a/events/CMakeLists.txt
+++ b/events/CMakeLists.txt
@@ -3,8 +3,7 @@
 
 if(NOT ${CMAKE_CROSSCOMPILING})
     add_subdirectory(tests/UNITTESTS)
-endif()
-
+else()
 add_library(mbed-events INTERFACE)
 
 target_include_directories(mbed-events
@@ -28,3 +27,4 @@
     INTERFACE
         MBED_CONF_EVENTS_PRESENT=1
 )
+endif()
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
index 95d984e..df4d8a2 100644
--- a/storage/CMakeLists.txt
+++ b/storage/CMakeLists.txt
@@ -26,11 +26,17 @@
 add_library(mbed-storage-direct-access-devicekey INTERFACE)
 add_library(mbed-storage-kv-global-api INTERFACE)
 
-
-add_subdirectory(blockdevice)
-add_subdirectory(filesystem)
-add_subdirectory(kvstore)
-add_subdirectory(platform)
+if(${CMAKE_CROSSCOMPILING})
+    # The directories below contain optional target libraries
+    add_subdirectory(blockdevice EXCLUDE_FROM_ALL)
+    add_subdirectory(filesystem EXCLUDE_FROM_ALL)
+    add_subdirectory(kvstore EXCLUDE_FROM_ALL)
+    add_subdirectory(platform EXCLUDE_FROM_ALL)
+else()
+    # Add these subdirectories for the Unit test
+    add_subdirectory(blockdevice)
+    add_subdirectory(kvstore)
+endif()
 
 target_include_directories(mbed-storage
     INTERFACE
diff --git a/targets/CMakeLists.txt b/targets/CMakeLists.txt
index fce00d6..36c9454 100644
--- a/targets/CMakeLists.txt
+++ b/targets/CMakeLists.txt
@@ -1,21 +1,23 @@
 # Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-include(mbed_set_linker_script)
-
-add_subdirectory(TARGET_Ambiq_Micro EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_Analog_Devices EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_ARM_FM EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_ARM_SSG EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_Cypress EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_Freescale EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_GigaDevice EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_Maxim EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_NORDIC EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_NUVOTON EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_NXP EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_RENESAS EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_Samsung EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_Silicon_Labs EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_TOSHIBA EXCLUDE_FROM_ALL)
+if(${CMAKE_CROSSCOMPILING})
+    include(mbed_set_linker_script)
+    
+    add_subdirectory(TARGET_Ambiq_Micro EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_Analog_Devices EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_ARM_FM EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_ARM_SSG EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_Cypress EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_Freescale EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_GigaDevice EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_Maxim EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_NORDIC EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_NUVOTON EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_NXP EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_RENESAS EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_Samsung EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_Silicon_Labs EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_STM EXCLUDE_FROM_ALL)
+    add_subdirectory(TARGET_TOSHIBA EXCLUDE_FROM_ALL)
+endif()