From 500f2c7526cb4f1d96cc4ba8780d9bd3fc387b02 Mon Sep 17 00:00:00 2001 From: Alistair Buxton Date: Sun, 12 Sep 2021 07:48:00 +0100 Subject: [PATCH] Update the pico extras helper This fixes https://github.com/raspberrypi/pico-extras/issues/24 so that PICO_EXTRAS_FETCH_FROM_GIT works. --- 32blit-pico/pico_extras_import.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/32blit-pico/pico_extras_import.cmake b/32blit-pico/pico_extras_import.cmake index 706add028..ad4095228 100644 --- a/32blit-pico/pico_extras_import.cmake +++ b/32blit-pico/pico_extras_import.cmake @@ -26,14 +26,14 @@ if (NOT PICO_EXTRAS_PATH) get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_EXTRAS_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}") endif () FetchContent_Declare( - PICO_EXTRAS + pico_extras GIT_REPOSITORY https://github.com/raspberrypi/pico-extras GIT_TAG master ) - if (NOT PICO_EXTRAS) - message("Downloading PICO EXTRAS") - FetchContent_Populate(PICO_EXTRAS) - set(PICO_EXTRAS_PATH ${PICO_EXTRAS_SOURCE_DIR}) + if (NOT pico_extras) + message("Downloading Raspberry Pi Pico Extras") + FetchContent_Populate(pico_extras) + set(PICO_EXTRAS_PATH ${pico_extras_SOURCE_DIR}) endif () set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE}) else ()