diff --git a/connectivity/drivers/wifi/CMakeLists.txt b/connectivity/drivers/wifi/CMakeLists.txt
index 32af7671277..78ecb7fa4ce 100644
--- a/connectivity/drivers/wifi/CMakeLists.txt
+++ b/connectivity/drivers/wifi/CMakeLists.txt
@@ -5,7 +5,9 @@ add_subdirectory(TARGET_WICED EXCLUDE_FROM_ALL)
 
 add_subdirectory(TARGET_STM EXCLUDE_FROM_ALL)
 
-add_subdirectory(COMPONENT_WHD EXCLUDE_FROM_ALL)
+if("WHD" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(COMPONENT_WHD EXCLUDE_FROM_ALL)
+endif()
 
 add_subdirectory(esp8266-driver)
 
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT064B0S2_4343W/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT064B0S2_4343W/CMakeLists.txt
index 287eec26007..6c0e9f529a5 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT064B0S2_4343W/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT064B0S2_4343W/CMakeLists.txt
@@ -67,11 +67,17 @@ target_link_libraries(mbed-cy8ckit064b0s2-4343w
         mbed-cy8ckit064b0s2-4343w-bsp-design-modus
         mbed-cm0p-secure
         mbed-psoc6
-        mbed-cy-psoc6-whd
-        mbed-cy-psoc6-whd-4343w
-        mbed-cy8ckit-064b0s2-4343w-whd
 )
 
+if("WHD" IN_LIST MBED_TARGET_LABELS)
+    target_link_libraries(mbed-cy8ckit064b0s2-4343w
+        INTERFACE
+            mbed-cy-psoc6-whd
+            mbed-cy-psoc6-whd-4343w
+            mbed-cy8ckit-064b0s2-4343w-whd
+    )
+endif()
+
 target_compile_definitions(mbed-cy8ckit064b0s2-4343w
     INTERFACE
         "CYB0644ABZI_S2D44"
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062S2_43012/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062S2_43012/CMakeLists.txt
index 6cb68eed848..bc123b1801c 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062S2_43012/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062S2_43012/CMakeLists.txt
@@ -65,11 +65,17 @@ target_link_libraries(mbed-cy8ckit-062s2-43012
         mbed-cy8ckit-062s2-43012-bsp-design-modus
         mbed-cm0p-sleep
         mbed-psoc6
-        mbed-cy-psoc6-whd
-        mbed-cy-psoc6-whd-43012
-        mbed-cy8ckit-062s2-43012-whd
 )
 
+if("WHD" IN_LIST MBED_TARGET_LABELS)
+    target_link_libraries(mbed-cy8ckit-062s2-43012
+        INTERFACE
+            mbed-cy-psoc6-whd
+            mbed-cy-psoc6-whd-43012
+            mbed-cy8ckit-062s2-43012-whd
+    )
+endif()
+
 target_compile_definitions(mbed-cy8ckit-062s2-43012
     INTERFACE
         "CY8C624ABZI_D44"
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT/CMakeLists.txt
index 2d66224f692..50de533e585 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT/CMakeLists.txt
@@ -65,12 +65,18 @@ target_link_libraries(mbed-cy8ckit-062-wifi-bt
         mbed-cy8ckit-062-wifi-bt-bsp-design-modus
         mbed-cm0p-sleep
         mbed-psoc6
-        mbed-cy-psoc6-whd
-        mbed-cy-psoc6-whd-4343w
-        mbed-cy8ckit-062-wifi-bt-whd
         mbed-udb-sdio-p12
 )
 
+if("WHD" IN_LIST MBED_TARGET_LABELS)
+    target_link_libraries(mbed-cy8ckit-062-wifi-bt
+        INTERFACE
+            mbed-cy-psoc6-whd
+            mbed-cy-psoc6-whd-4343w
+            mbed-cy8ckit-062-wifi-bt-whd
+    )
+endif()
+
 target_compile_definitions(mbed-cy8ckit-062-wifi-bt
     INTERFACE
         "CY8C6247BZI_D54"
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062S3_4343W/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062S3_4343W/CMakeLists.txt
index 5edf88d0c31..4590f287920 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062S3_4343W/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062S3_4343W/CMakeLists.txt
@@ -66,12 +66,18 @@ target_link_libraries(mbed-cy8cproto-062s3-4343w
         mbed-cy8cproto-062s3-4343w-bsp-design-modus
         mbed-cm0p-sleep
         mbed-psoc6
-        mbed-cy-psoc6-whd
-        mbed-cy-psoc6-whd-4343w
-        mbed-cy8cproto-062s3-4343w-whd
         mbed-cy-external-wifi-fw
 )
 
+if("WHD" IN_LIST MBED_TARGET_LABELS)
+    target_link_libraries(mbed-cy8cproto-062s3-4343w
+        INTERFACE
+            mbed-cy-psoc6-whd
+            mbed-cy-psoc6-whd-4343w
+            mbed-cy8cproto-062s3-4343w-whd
+    )
+endif()
+
 target_compile_definitions(mbed-cy8cproto-062s3-4343w
     INTERFACE
         "CY8C6245LQI_S3D72"
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062_4343W/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062_4343W/CMakeLists.txt
index 5490d9d0136..9d8a30254a6 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062_4343W/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062_4343W/CMakeLists.txt
@@ -66,11 +66,17 @@ target_link_libraries(mbed-cy8cproto-062-4343w
         mbed-cy8cproto-062-4343w-bsp-design-modus
         mbed-cm0p-sleep
         mbed-psoc6
-        mbed-cy-psoc6-whd
-        mbed-cy-psoc6-whd-4343w
-        mbed-cy8cproto-062-4343w-whd
 )
 
+if("WHD" IN_LIST MBED_TARGET_LABELS)
+    target_link_libraries(mbed-cy8cproto-062-4343w
+        INTERFACE
+            mbed-cy-psoc6-whd
+            mbed-cy-psoc6-whd-4343w
+            mbed-cy8cproto-062-4343w-whd
+    )
+endif()
+
 target_compile_definitions(mbed-cy8cproto-062-4343w
     INTERFACE
         "CY8C624ABZI_D44"
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYTFM_064B0S2_4343W/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYTFM_064B0S2_4343W/CMakeLists.txt
index 0c4784db758..9c3afacb056 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYTFM_064B0S2_4343W/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYTFM_064B0S2_4343W/CMakeLists.txt
@@ -58,11 +58,17 @@ target_link_libraries(mbed-cytfm-064b0s2-4343w
         mbed-cytfm-064b0s2-4343w-cm4
         mbed-cytfm-064b0s2-4343w-bsp-design-modus
         mbed-psoc6
-        mbed-cy-psoc6-whd
-        mbed-cy-psoc6-whd-4343w
-        mbed-cytfm-064b0s2-4343w-whd
 )
 
+if("WHD" IN_LIST MBED_TARGET_LABELS)
+    target_link_libraries(mbed-cytfm-064b0s2-4343w
+        INTERFACE
+            mbed-cy-psoc6-whd
+            mbed-cy-psoc6-whd-4343w
+            mbed-cytfm-064b0s2-4343w-whd
+    )
+endif()
+
 target_compile_definitions(mbed-cytfm-064b0s2-4343w
     INTERFACE
         "CYB0644ABZI_S2D44"
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt
index dc3a1e4f460..185a00c2a29 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt
@@ -67,12 +67,18 @@ target_link_libraries(mbed-cyw9p62s1-43012evb-01
         mbed-cyw9p62s1-43012evb-01-bsp-design-modus
         mbed-cm0p-sleep
         mbed-psoc6
-        mbed-cy-psoc6-whd
-        mbed-cy-psoc6-whd-43012
-        mbed-cyw9p62s1-43012evb-01-whd
         mbed-udb-sdio-p12
 )
 
+if("WHD" IN_LIST MBED_TARGET_LABELS)
+    target_link_libraries(mbed-cyw9p62s1-43012evb-01
+        INTERFACE
+            mbed-cy-psoc6-whd
+            mbed-cy-psoc6-whd-43012
+            mbed-cyw9p62s1-43012evb-01-whd
+    )
+endif()
+
 target_compile_definitions(mbed-cyw9p62s1-43012evb-01
     INTERFACE
         "CY8C6247FDI_D52"
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43438EVB_01/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43438EVB_01/CMakeLists.txt
index 72531c1c0f1..f76d66e8293 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43438EVB_01/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43438EVB_01/CMakeLists.txt
@@ -66,12 +66,18 @@ target_link_libraries(mbed-cyw9p62s1-43438evb-01
         mbed-cyw9p62s1-43438evb-01-bsp-design-modus
         mbed-cm0p-sleep
         mbed-psoc6
-        mbed-cy-psoc6-whd
-        mbed-cy-psoc6-whd-43438
-        mbed-cyw9p62s1-43438evb-01-whd
         mbed-udb-sdio-p2
 )
 
+if("WHD" IN_LIST MBED_TARGET_LABELS)
+    target_link_libraries(mbed-cyw9p62s1-43438evb-01
+        INTERFACE
+            mbed-cy-psoc6-whd
+            mbed-cy-psoc6-whd-43438
+            mbed-cyw9p62s1-43438evb-01-whd
+    )
+endif()
+
 target_compile_definitions(mbed-cyw9p62s1-43438evb-01
     INTERFACE
         "CY8C6247BZI_D54"