moved examples into their own directory, moved pico support code into libraries directory, fixed cmake configuration

CMakeLists.txt

@@ -14,4 +14,4 @@ add_subdirectory(drivers)
 add_subdirectory(libraries)
 
 # Example Pico Pack projects
-add_subdirectory(pack)
+add_subdirectory(examples)

examples/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_subdirectory(pico_display)
+add_subdirectory(pico_unicorn)

examples/pico_display/CMakeLists.txt

@@ -2,11 +2,10 @@ add_executable(
   display
   demo.cpp
   image_data.cpp
-  pico_display.cpp
 )
 
 # Pull in pico libraries that we need
-target_link_libraries(display pico_stdlib hardware_spi hardware_pwm hardware_dma st7789 pico_graphics)
+target_link_libraries(display pico_stdlib hardware_spi hardware_pwm hardware_dma pico_display)
 
 # create map/bin/hex file etc.
 pico_add_extra_outputs(display)

examples/pico_unicorn/CMakeLists.txt

@@ -0,0 +1,10 @@
+add_executable(
+  unicorn
+  demo.cpp
+)
+
+# Pull in pico libraries that we need
+target_link_libraries(unicorn pico_stdlib hardware_pio hardware_dma pico_unicorn)
+
+# create map/bin/hex file etc.
+pico_add_extra_outputs(unicorn)

libraries/CMakeLists.txt

@@ -1 +1,3 @@
-add_subdirectory(pico_graphics)
+add_subdirectory(pico_graphics)
+add_subdirectory(pico_display)
+add_subdirectory(pico_unicorn)

libraries/pico_display/CMakeLists.txt

@@ -0,0 +1,10 @@
+add_library(pico_display INTERFACE)
+
+target_sources(pico_display INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/pico_display.cpp
+)
+
+target_include_directories(pico_display INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(pico_display INTERFACE pico_stdlib hardware_spi hardware_pwm hardware_dma st7789 pico_graphics)

libraries/pico_unicorn/CMakeLists.txt

@@ -0,0 +1,12 @@
+add_library(pico_unicorn INTERFACE)
+
+pico_generate_pio_header(pico_unicorn ${CMAKE_CURRENT_LIST_DIR}/pico_unicorn.pio)
+
+target_sources(pico_unicorn INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/pico_unicorn.cpp
+)
+
+target_include_directories(pico_unicorn INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(pico_unicorn INTERFACE pico_stdlib hardware_pio hardware_dma)

libraries/pico_unicorn/pico_unicorn.cpp

@@ -3,7 +3,7 @@
 #include "hardware/dma.h"
 #include "hardware/irq.h"
 
-#include "unicorn.pio.h"
+#include "pico_unicorn.pio.h"
 #include "pico_unicorn.hpp"
 
 // pixel data is stored as a stream of bits delivered in the

pack/CMakeLists.txt

@@ -1,4 +0,0 @@
-if (NOT PICO_NO_HARDWARE)
-    add_subdirectory(display)
-    add_subdirectory(unicorn)
-endif ()

pack/unicorn/CMakeLists.txt

@@ -1,25 +0,0 @@
-cmake_minimum_required(VERSION 3.12)
-
-# Pull in PICO SDK (must be before project)
-include(pico_sdk_import.cmake)
-
-project(pico_examples C CXX ASM)
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 17)
-
-# Initialize the SDK
-pico_sdk_init()
-
-add_executable(
-  unicorn
-  demo.cpp
-  pico_unicorn.cpp
-)
-
-pico_generate_pio_header(unicorn ${CMAKE_CURRENT_LIST_DIR}/unicorn.pio)
-
-# Pull in pico libraries that we need
-target_link_libraries(unicorn pico_stdlib hardware_pio hardware_dma)
-
-# create map/bin/hex file etc.
-pico_add_extra_outputs(unicorn)

pack/unicorn/pico_sdk_import.cmake

@@ -1,64 +0,0 @@
-# This is a copy of <PICO_SDK_PATH>/external/pico_sdk_import.cmake
-
-# This can be dropped into an external project to help locate this SDK
-# It should be include()ed prior to project()
-
-# todo document
-
-if (DEFINED ENV{PICO_SDK_PATH} AND (NOT PICO_SDK_PATH))
-    set(PICO_SDK_PATH $ENV{PICO_SDK_PATH})
-    message("Using PICO_SDK_PATH from environment ('${PICO_SDK_PATH}')")
-endif ()
-
-if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT} AND (NOT PICO_SDK_FETCH_FROM_GIT))
-    set(PICO_SDK_FETCH_FROM_GIT $ENV{PICO_SDK_FETCH_FROM_GIT})
-    message("Using PICO_SDK_FETCH_FROM_GIT from environment ('${PICO_SDK_FETCH_FROM_GIT}')")
-endif ()
-
-if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_PATH} AND (NOT PICO_SDK_FETCH_FROM_GIT_PATH))
-    set(PICO_SDK_FETCH_FROM_GIT_PATH $ENV{PICO_SDK_FETCH_FROM_GIT_PATH})
-    message("Using PICO_SDK_FETCH_FROM_GIT_PATH from environment ('${PICO_SDK_FETCH_FROM_GIT_PATH}')")
-endif ()
-
-set(PICO_SDK_PATH "${PICO_SDK_PATH}" CACHE PATH "Path to the PICO SDK")
-set(PICO_SDK_FETCH_FROM_GIT "${PICO_SDK_FETCH_FROM_GIT}" CACHE BOOL "Set to ON to fetch copy of PICO SDK from git if not otherwise locatable")
-set(PICO_SDK_FETCH_FROM_GIT_PATH "${PICO_SDK_FETCH_FROM_GIT_PATH}" CACHE FILEPATH "location to download SDK")
-
-if (NOT PICO_SDK_PATH)
-    if (PICO_SDK_FETCH_FROM_GIT)
-        include(FetchContent)
-        set(FETCHCONTENT_BASE_DIR_SAVE ${FETCHCONTENT_BASE_DIR})
-        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}")
-        endif ()
-        FetchContent_Declare(
-                pico_sdk
-                GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
-                GIT_TAG master
-        )
-        if (NOT pico_sdk)
-            message("Downloading PICO SDK")
-            FetchContent_Populate(pico_sdk)
-            set(PICO_SDK_PATH ${pico_sdk_SOURCE_DIR})
-        endif ()
-        set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE})
-    else ()
-        message(FATAL_ERROR
-                "PICO SDK location was not specified. Please set PICO_SDK_PATH or set PICO_SDK_FETCH_FROM_GIT to on to fetch from git."
-                )
-    endif ()
-endif ()
-
-get_filename_component(PICO_SDK_PATH "${PICO_SDK_PATH}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
-if (NOT EXISTS ${PICO_SDK_PATH})
-    message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' not found")
-endif ()
-
-set(PICO_SDK_INIT_CMAKE_FILE ${PICO_SDK_PATH}/pico_sdk_init.cmake)
-if (NOT EXISTS ${PICO_SDK_INIT_CMAKE_FILE})
-    message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' does not appear to contain the PICO SDK")
-endif ()
-
-set(PICO_SDK_PATH ${PICO_SDK_PATH} CACHE PATH "Path to the PICO SDK" FORCE)
-
-include(${PICO_SDK_INIT_CMAKE_FILE})