mirror
/
raspi-pico-aprs-tnc
kopia lustrzana https://github.com/eleccoder/raspi-pico-aprs-tnc
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Update from origin

main
eleccoder 2022-12-21 14:22:28 +01:00
rodzic b437375ee5
commit 02a22624f1
2 zmienionych plików z 22 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
cmake/pico_extras_import.cmake
Wyświetl plik

@ -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}") get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_EXTRAS_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
endif () endif ()
FetchContent_Declare( FetchContent_Declare(
PICO_EXTRAS pico_extras
GIT_REPOSITORY https://github.com/raspberrypi/pico-extras GIT_REPOSITORY https://github.com/raspberrypi/pico-extras
GIT_TAG master GIT_TAG master
) )
if (NOT PICO_EXTRAS) if (NOT pico_extras)
message("Downloading PICO EXTRAS") message("Downloading Raspberry Pi Pico Extras")
FetchContent_Populate(PICO_EXTRAS) FetchContent_Populate(pico_extras)
set(PICO_EXTRAS_PATH ${PICO_EXTRAS_SOURCE_DIR}) set(PICO_EXTRAS_PATH ${pico_extras_SOURCE_DIR})
endif () endif ()
set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE}) set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE})
else () else ()
@ -59,4 +59,4 @@ endif ()
set(PICO_EXTRAS_PATH ${PICO_EXTRAS_PATH} CACHE PATH "Path to the PICO EXTRAS" FORCE) set(PICO_EXTRAS_PATH ${PICO_EXTRAS_PATH} CACHE PATH "Path to the PICO EXTRAS" FORCE)
add_subdirectory(${PICO_EXTRAS_PATH} pico_extras) add_subdirectory(${PICO_EXTRAS_PATH} pico_extras)

21
cmake/pico_sdk_import.cmake
Wyświetl plik

@ -29,11 +29,22 @@ if (NOT PICO_SDK_PATH)
if (PICO_SDK_FETCH_FROM_GIT_PATH) if (PICO_SDK_FETCH_FROM_GIT_PATH)
get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_SDK_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}") get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_SDK_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
endif () endif ()
FetchContent_Declare( # GIT_SUBMODULES_RECURSE was added in 3.17
pico_sdk if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17.0")
GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk FetchContent_Declare(
GIT_TAG master pico_sdk
) GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
GIT_TAG master
GIT_SUBMODULES_RECURSE FALSE
)
else ()
FetchContent_Declare(
pico_sdk
GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
GIT_TAG master
)
endif ()
if (NOT pico_sdk) if (NOT pico_sdk)
message("Downloading Raspberry Pi Pico SDK") message("Downloading Raspberry Pi Pico SDK")
FetchContent_Populate(pico_sdk) FetchContent_Populate(pico_sdk)