From 3e043bd39a92c5f87ee514a0e7fcd189eddb3113 Mon Sep 17 00:00:00 2001 From: Jonathan Williamson Date: Sat, 16 Jan 2021 14:43:21 +0000 Subject: [PATCH] Add heirarchical build to mimic pico-examples --- .gitignore | 1 + CMakeLists.txt | 14 ++++++++++++++ pack/CMakeLists.txt | 4 ++++ pack/display/CMakeLists.txt | 14 +------------- .../pico_sdk_import.cmake => pico_sdk_import.cmake | 0 5 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 pack/CMakeLists.txt rename pack/display/pico_sdk_import.cmake => pico_sdk_import.cmake (100%) diff --git a/.gitignore b/.gitignore index 08e9f76d..89929922 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ *.app **/build +.vscode diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..e89b15af --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,14 @@ +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() + +# Example projects +add_subdirectory(pack) diff --git a/pack/CMakeLists.txt b/pack/CMakeLists.txt new file mode 100644 index 00000000..a48803ae --- /dev/null +++ b/pack/CMakeLists.txt @@ -0,0 +1,4 @@ +if (NOT PICO_NO_HARDWARE) + add_subdirectory(display) + add_subdirectory(unicorn) +endif () diff --git a/pack/display/CMakeLists.txt b/pack/display/CMakeLists.txt index 9bfdeb56..3d87a9fb 100644 --- a/pack/display/CMakeLists.txt +++ b/pack/display/CMakeLists.txt @@ -1,15 +1,3 @@ -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( display demo.cpp @@ -23,4 +11,4 @@ add_executable( target_link_libraries(display pico_stdlib hardware_spi hardware_pwm hardware_dma) # create map/bin/hex file etc. -pico_add_extra_outputs(display) +pico_add_extra_outputs(display) \ No newline at end of file diff --git a/pack/display/pico_sdk_import.cmake b/pico_sdk_import.cmake similarity index 100% rename from pack/display/pico_sdk_import.cmake rename to pico_sdk_import.cmake