Moved pico-sdk-specific hw libraries from root CMakeLists.txt to hard…

…ware/rp2xxx/prebuild.cmake (#27)
mcknly · Oct 31, 2024 · cb0e717 · cb0e717
1 parent 1f4760c
commit cb0e717
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,12 +40,6 @@ target_link_libraries(${PROJ_NAME} PUBLIC
     cli
     littlefs
     cmake_git_version_tracking
-    hardware_i2c
-    hardware_spi
-    hardware_flash
-    hardware_adc
-    cmsis_core
-    tinyusb_device
     ${hardware_libs}
 )
 target_include_directories(${PROJ_NAME} PUBLIC

diff --git a/hardware/rp2xxx/prebuild.cmake b/hardware/rp2xxx/prebuild.cmake
@@ -8,7 +8,15 @@ include(${hardware_dir}/pico_sdk_import.cmake)
 
 # Platform-specific variable for paths/libraries/etc
 set(hardware_includes ${hardware_dir})
-set(hardware_libs "pico_unique_id" "pico_stdlib")
+set(hardware_libs   "pico_unique_id"
+                    "pico_stdlib"
+                    "hardware_i2c"
+                    "hardware_spi"
+                    "hardware_flash"
+                    "hardware_adc"
+                    "cmsis_core"
+                    "tinyusb_device"                    
+)
 
 # FreeRTOS port subdirectory for this platform (relative to $FREERTOS_KERNEL_PATH)
 # If it is a RP2350 board the board name needs to be added here to select the right port