diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58ee47148..8f601316a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,12 +43,8 @@ function(add_subdirectory_exclude_platforms NAME)
 endfunction()
 
 # Add blink example
-if (PICO_CYW43_SUPPORTED) # set by PICO_BOARD=pico_w
-    if (NOT TARGET pico_cyw43_arch)
-        message("Skipping blink for Pico W as support is not available")
-    else()
-        add_subdirectory_exclude_platforms(blink)
-    endif()
+if (PICO_CYW43_SUPPORTED AND NOT TARGET pico_cyw43_arch)
+    message("Skipping blink for Pico W as support is not available")
 else()
     add_subdirectory_exclude_platforms(blink)
 endif()
diff --git a/adc/CMakeLists.txt b/adc/CMakeLists.txt
index b628a4547..5168ce2f3 100644
--- a/adc/CMakeLists.txt
+++ b/adc/CMakeLists.txt
@@ -5,12 +5,8 @@ if (TARGET hardware_adc)
     add_subdirectory_exclude_platforms(joystick_display)
     add_subdirectory_exclude_platforms(onboard_temperature)
     add_subdirectory_exclude_platforms(microphone_adc)
-    if (PICO_CYW43_SUPPORTED) # set by PICO_BOARD=pico_w
-        if (NOT TARGET pico_cyw43_arch)
-            message("Skipping read_vsys for Pico W as support is not available")
-        else()
-            add_subdirectory_exclude_platforms(read_vsys)
-        endif()
+    if (PICO_CYW43_SUPPORTED AND NOT TARGET pico_cyw43_arch)
+        message("Skipping read_vsys for Pico W as support is not available")
     else()
         add_subdirectory_exclude_platforms(read_vsys)
     endif()