From 37cac5940b858aef4e6b604f148ce339ed32b1b0 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Thu, 13 May 2021 12:06:01 +0100
Subject: [PATCH] Remove relative include paths

This change removes file-relative include paths and adds the project root as a global include path.

* Project root added to CMakeLists.txt so that all targets can find includes
* Project root added micropython.cmake so that targets used by the MicroPython build can find includes

Note: pico-boilerplate projects must set this include path
---
 CMakeLists.txt                                                | 4 ++++
 libraries/breakout_as7262/breakout_as7262.hpp                 | 2 +-
 .../breakout_colourlcd160x80/breakout_colourlcd160x80.hpp     | 4 ++--
 .../breakout_colourlcd240x240/breakout_colourlcd240x240.hpp   | 4 ++--
 libraries/breakout_dotmatrix/breakout_dotmatrix.hpp           | 2 +-
 libraries/breakout_ltr559/breakout_ltr559.hpp                 | 2 +-
 libraries/breakout_matrix11x7/breakout_matrix11x7.hpp         | 2 +-
 libraries/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.hpp     | 2 +-
 libraries/breakout_roundlcd/breakout_roundlcd.hpp             | 4 ++--
 libraries/breakout_sgp30/breakout_sgp30.hpp                   | 2 +-
 libraries/breakout_trackball/breakout_trackball.hpp           | 2 +-
 libraries/pico_display/pico_display.hpp                       | 4 ++--
 libraries/pico_explorer/pico_explorer.hpp                     | 4 ++--
 libraries/pico_wireless/pico_wireless.cpp                     | 2 +-
 libraries/pico_wireless/pico_wireless.hpp                     | 2 +-
 micropython/modules/breakout_as7262/breakout_as7262.cpp       | 2 +-
 .../breakout_colourlcd160x80/breakout_colourlcd160x80.cpp     | 2 +-
 .../breakout_colourlcd240x240/breakout_colourlcd240x240.cpp   | 2 +-
 micropython/modules/breakout_dotmatrix/breakout_dotmatrix.cpp | 2 +-
 micropython/modules/breakout_ltr559/breakout_ltr559.cpp       | 2 +-
 .../modules/breakout_matrix11x7/breakout_matrix11x7.cpp       | 2 +-
 .../modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.cpp   | 2 +-
 micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp   | 2 +-
 micropython/modules/breakout_sgp30/breakout_sgp30.cpp         | 2 +-
 micropython/modules/breakout_trackball/breakout_trackball.cpp | 2 +-
 micropython/modules/micropython.cmake                         | 2 ++
 micropython/modules/pico_display/pico_display.cpp             | 2 +-
 micropython/modules/pico_explorer/pico_explorer.cpp           | 2 +-
 micropython/modules/pico_rgb_keypad/pico_rgb_keypad.cpp       | 2 +-
 micropython/modules/pico_scroll/pico_scroll.cpp               | 2 +-
 micropython/modules/pico_unicorn/pico_unicorn.cpp             | 2 +-
 micropython/modules/pico_wireless/pico_wireless.cpp           | 2 +-
 32 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a760edc7..f134b0ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,10 @@ function(add_resource target file)
   target_sources(${ARGV0} PRIVATE ${NAME}.o)
 endfunction(add_resource)
 
+include_directories(
+  ${CMAKE_CURRENT_LIST_DIR}
+)
+
 add_subdirectory(drivers)
 add_subdirectory(libraries)
 
diff --git a/libraries/breakout_as7262/breakout_as7262.hpp b/libraries/breakout_as7262/breakout_as7262.hpp
index 7894124f..eee44194 100644
--- a/libraries/breakout_as7262/breakout_as7262.hpp
+++ b/libraries/breakout_as7262/breakout_as7262.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../drivers/as7262/as7262.hpp"
+#include "drivers/as7262/as7262.hpp"
 
 namespace pimoroni {
 
diff --git a/libraries/breakout_colourlcd160x80/breakout_colourlcd160x80.hpp b/libraries/breakout_colourlcd160x80/breakout_colourlcd160x80.hpp
index 97741431..7e628be7 100644
--- a/libraries/breakout_colourlcd160x80/breakout_colourlcd160x80.hpp
+++ b/libraries/breakout_colourlcd160x80/breakout_colourlcd160x80.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../drivers/st7735/st7735.hpp"
-#include "../../libraries/pico_graphics/pico_graphics.hpp"
+#include "drivers/st7735/st7735.hpp"
+#include "libraries/pico_graphics/pico_graphics.hpp"
 
 namespace pimoroni {
 
diff --git a/libraries/breakout_colourlcd240x240/breakout_colourlcd240x240.hpp b/libraries/breakout_colourlcd240x240/breakout_colourlcd240x240.hpp
index 560260eb..470b8d70 100644
--- a/libraries/breakout_colourlcd240x240/breakout_colourlcd240x240.hpp
+++ b/libraries/breakout_colourlcd240x240/breakout_colourlcd240x240.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../drivers/st7789/st7789.hpp"
-#include "../../libraries/pico_graphics/pico_graphics.hpp"
+#include "drivers/st7789/st7789.hpp"
+#include "libraries/pico_graphics/pico_graphics.hpp"
 
 namespace pimoroni {
 
diff --git a/libraries/breakout_dotmatrix/breakout_dotmatrix.hpp b/libraries/breakout_dotmatrix/breakout_dotmatrix.hpp
index 0a6b59a0..f103cbd3 100644
--- a/libraries/breakout_dotmatrix/breakout_dotmatrix.hpp
+++ b/libraries/breakout_dotmatrix/breakout_dotmatrix.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../drivers/ltp305/ltp305.hpp"
+#include "drivers/ltp305/ltp305.hpp"
 
 namespace pimoroni {
 
diff --git a/libraries/breakout_ltr559/breakout_ltr559.hpp b/libraries/breakout_ltr559/breakout_ltr559.hpp
index e50f792e..fa3eff5e 100644
--- a/libraries/breakout_ltr559/breakout_ltr559.hpp
+++ b/libraries/breakout_ltr559/breakout_ltr559.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../drivers/ltr559/ltr559.hpp"
+#include "drivers/ltr559/ltr559.hpp"
 
 namespace pimoroni {
 
diff --git a/libraries/breakout_matrix11x7/breakout_matrix11x7.hpp b/libraries/breakout_matrix11x7/breakout_matrix11x7.hpp
index c8de1c3a..4ebebd19 100644
--- a/libraries/breakout_matrix11x7/breakout_matrix11x7.hpp
+++ b/libraries/breakout_matrix11x7/breakout_matrix11x7.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../drivers/is31fl3731/is31fl3731.hpp"
+#include "drivers/is31fl3731/is31fl3731.hpp"
 
 namespace pimoroni {
     class BreakoutMatrix11x7 : public IS31FL3731 {
diff --git a/libraries/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.hpp b/libraries/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.hpp
index b37da411..e98dd447 100644
--- a/libraries/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.hpp
+++ b/libraries/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../drivers/is31fl3731/is31fl3731.hpp"
+#include "drivers/is31fl3731/is31fl3731.hpp"
 
 namespace pimoroni {
     struct RGBLookup {
diff --git a/libraries/breakout_roundlcd/breakout_roundlcd.hpp b/libraries/breakout_roundlcd/breakout_roundlcd.hpp
index a9c18357..9d0c07e0 100644
--- a/libraries/breakout_roundlcd/breakout_roundlcd.hpp
+++ b/libraries/breakout_roundlcd/breakout_roundlcd.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../drivers/st7789/st7789.hpp"
-#include "../../libraries/pico_graphics/pico_graphics.hpp"
+#include "drivers/st7789/st7789.hpp"
+#include "libraries/pico_graphics/pico_graphics.hpp"
 
 namespace pimoroni {
 
diff --git a/libraries/breakout_sgp30/breakout_sgp30.hpp b/libraries/breakout_sgp30/breakout_sgp30.hpp
index 2eeaac2f..63710724 100644
--- a/libraries/breakout_sgp30/breakout_sgp30.hpp
+++ b/libraries/breakout_sgp30/breakout_sgp30.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../drivers/sgp30/sgp30.hpp"
+#include "drivers/sgp30/sgp30.hpp"
 
 namespace pimoroni {
 
diff --git a/libraries/breakout_trackball/breakout_trackball.hpp b/libraries/breakout_trackball/breakout_trackball.hpp
index 46f10197..a820c2c5 100644
--- a/libraries/breakout_trackball/breakout_trackball.hpp
+++ b/libraries/breakout_trackball/breakout_trackball.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../drivers/trackball/trackball.hpp"
+#include "drivers/trackball/trackball.hpp"
 
 namespace pimoroni {
 
diff --git a/libraries/pico_display/pico_display.hpp b/libraries/pico_display/pico_display.hpp
index a0553abf..cac58af1 100644
--- a/libraries/pico_display/pico_display.hpp
+++ b/libraries/pico_display/pico_display.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../drivers/st7789/st7789.hpp"
-#include "../../libraries/pico_graphics/pico_graphics.hpp"
+#include "drivers/st7789/st7789.hpp"
+#include "libraries/pico_graphics/pico_graphics.hpp"
 
 namespace pimoroni {
 
diff --git a/libraries/pico_explorer/pico_explorer.hpp b/libraries/pico_explorer/pico_explorer.hpp
index dbde16e5..0cee484c 100644
--- a/libraries/pico_explorer/pico_explorer.hpp
+++ b/libraries/pico_explorer/pico_explorer.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../drivers/st7789/st7789.hpp"
-#include "../../libraries/pico_graphics/pico_graphics.hpp"
+#include "drivers/st7789/st7789.hpp"
+#include "libraries/pico_graphics/pico_graphics.hpp"
 
 namespace pimoroni {
 
diff --git a/libraries/pico_wireless/pico_wireless.cpp b/libraries/pico_wireless/pico_wireless.cpp
index 4c6df7da..7d452088 100644
--- a/libraries/pico_wireless/pico_wireless.cpp
+++ b/libraries/pico_wireless/pico_wireless.cpp
@@ -1,5 +1,5 @@
 #include "pico_wireless.hpp"
-#include "../../drivers/esp32spi/spi_drv.hpp"
+#include "drivers/esp32spi/spi_drv.hpp"
 
 namespace pimoroni {
 
diff --git a/libraries/pico_wireless/pico_wireless.hpp b/libraries/pico_wireless/pico_wireless.hpp
index 387e5527..27ce67ae 100644
--- a/libraries/pico_wireless/pico_wireless.hpp
+++ b/libraries/pico_wireless/pico_wireless.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "pico/stdlib.h"
-#include "../../drivers/esp32spi/esp32spi.hpp"
+#include "drivers/esp32spi/esp32spi.hpp"
 
 namespace pimoroni {
 
diff --git a/micropython/modules/breakout_as7262/breakout_as7262.cpp b/micropython/modules/breakout_as7262/breakout_as7262.cpp
index 35ae2bcd..511ca13e 100644
--- a/micropython/modules/breakout_as7262/breakout_as7262.cpp
+++ b/micropython/modules/breakout_as7262/breakout_as7262.cpp
@@ -1,4 +1,4 @@
-#include "../../../libraries/breakout_as7262/breakout_as7262.hpp"
+#include "libraries/breakout_as7262/breakout_as7262.hpp"
 
 #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o))
 
diff --git a/micropython/modules/breakout_colourlcd160x80/breakout_colourlcd160x80.cpp b/micropython/modules/breakout_colourlcd160x80/breakout_colourlcd160x80.cpp
index 8f2918eb..562bd9c8 100644
--- a/micropython/modules/breakout_colourlcd160x80/breakout_colourlcd160x80.cpp
+++ b/micropython/modules/breakout_colourlcd160x80/breakout_colourlcd160x80.cpp
@@ -1,4 +1,4 @@
-#include "../../../libraries/breakout_colourlcd160x80/breakout_colourlcd160x80.hpp"
+#include "libraries/breakout_colourlcd160x80/breakout_colourlcd160x80.hpp"
 
 #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o))
 
diff --git a/micropython/modules/breakout_colourlcd240x240/breakout_colourlcd240x240.cpp b/micropython/modules/breakout_colourlcd240x240/breakout_colourlcd240x240.cpp
index d945c734..01ea1762 100644
--- a/micropython/modules/breakout_colourlcd240x240/breakout_colourlcd240x240.cpp
+++ b/micropython/modules/breakout_colourlcd240x240/breakout_colourlcd240x240.cpp
@@ -1,4 +1,4 @@
-#include "../../../libraries/breakout_colourlcd240x240/breakout_colourlcd240x240.hpp"
+#include "libraries/breakout_colourlcd240x240/breakout_colourlcd240x240.hpp"
 
 #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o))
 
diff --git a/micropython/modules/breakout_dotmatrix/breakout_dotmatrix.cpp b/micropython/modules/breakout_dotmatrix/breakout_dotmatrix.cpp
index 201cb6bf..7eb81ac0 100644
--- a/micropython/modules/breakout_dotmatrix/breakout_dotmatrix.cpp
+++ b/micropython/modules/breakout_dotmatrix/breakout_dotmatrix.cpp
@@ -1,4 +1,4 @@
-#include "../../../libraries/breakout_dotmatrix/breakout_dotmatrix.hpp"
+#include "libraries/breakout_dotmatrix/breakout_dotmatrix.hpp"
 
 #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o))
 
diff --git a/micropython/modules/breakout_ltr559/breakout_ltr559.cpp b/micropython/modules/breakout_ltr559/breakout_ltr559.cpp
index 0001c2cb..77448e21 100644
--- a/micropython/modules/breakout_ltr559/breakout_ltr559.cpp
+++ b/micropython/modules/breakout_ltr559/breakout_ltr559.cpp
@@ -1,4 +1,4 @@
-#include "../../../libraries/breakout_ltr559/breakout_ltr559.hpp"
+#include "libraries/breakout_ltr559/breakout_ltr559.hpp"
 
 #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o))
 
diff --git a/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.cpp b/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.cpp
index 9cd905dd..e6f98720 100644
--- a/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.cpp
+++ b/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.cpp
@@ -1,4 +1,4 @@
-#include "../../../libraries/breakout_matrix11x7/breakout_matrix11x7.hpp"
+#include "libraries/breakout_matrix11x7/breakout_matrix11x7.hpp"
 
 #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o))
 
diff --git a/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.cpp b/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.cpp
index 5d7c7dc4..bd513a38 100644
--- a/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.cpp
+++ b/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.cpp
@@ -1,4 +1,4 @@
-#include "../../../libraries/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.hpp"
+#include "libraries/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.hpp"
 
 #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o))
 
diff --git a/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp b/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp
index 920d5c69..3717bd45 100644
--- a/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp
+++ b/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp
@@ -1,4 +1,4 @@
-#include "../../../libraries/breakout_roundlcd/breakout_roundlcd.hpp"
+#include "libraries/breakout_roundlcd/breakout_roundlcd.hpp"
 
 #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o))
 
diff --git a/micropython/modules/breakout_sgp30/breakout_sgp30.cpp b/micropython/modules/breakout_sgp30/breakout_sgp30.cpp
index 38be4e2c..5bdd7191 100644
--- a/micropython/modules/breakout_sgp30/breakout_sgp30.cpp
+++ b/micropython/modules/breakout_sgp30/breakout_sgp30.cpp
@@ -1,4 +1,4 @@
-#include "../../../libraries/breakout_sgp30/breakout_sgp30.hpp"
+#include "libraries/breakout_sgp30/breakout_sgp30.hpp"
 
 #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o))
 
diff --git a/micropython/modules/breakout_trackball/breakout_trackball.cpp b/micropython/modules/breakout_trackball/breakout_trackball.cpp
index 054c21ca..caaba661 100644
--- a/micropython/modules/breakout_trackball/breakout_trackball.cpp
+++ b/micropython/modules/breakout_trackball/breakout_trackball.cpp
@@ -1,4 +1,4 @@
-#include "../../../libraries/breakout_trackball/breakout_trackball.hpp"
+#include "libraries/breakout_trackball/breakout_trackball.hpp"
 
 #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o))
 
diff --git a/micropython/modules/micropython.cmake b/micropython/modules/micropython.cmake
index 770ee370..7bdbec41 100644
--- a/micropython/modules/micropython.cmake
+++ b/micropython/modules/micropython.cmake
@@ -1,3 +1,5 @@
+include_directories(${CMAKE_CURRENT_LIST_DIR}/../../)
+
 include(${CMAKE_CURRENT_LIST_DIR}/breakout_dotmatrix/micropython.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/breakout_ltr559/micropython.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/breakout_colourlcd160x80/micropython.cmake)
diff --git a/micropython/modules/pico_display/pico_display.cpp b/micropython/modules/pico_display/pico_display.cpp
index a431dfa3..0d931ffc 100644
--- a/micropython/modules/pico_display/pico_display.cpp
+++ b/micropython/modules/pico_display/pico_display.cpp
@@ -2,7 +2,7 @@
 #include "hardware/sync.h"
 #include "pico/binary_info.h"
 
-#include "../../../libraries/pico_display/pico_display.hpp"
+#include "libraries/pico_display/pico_display.hpp"
 
 using namespace pimoroni;
 
diff --git a/micropython/modules/pico_explorer/pico_explorer.cpp b/micropython/modules/pico_explorer/pico_explorer.cpp
index 5ca53e2f..5f75de02 100644
--- a/micropython/modules/pico_explorer/pico_explorer.cpp
+++ b/micropython/modules/pico_explorer/pico_explorer.cpp
@@ -2,7 +2,7 @@
 #include "hardware/sync.h"
 #include "pico/binary_info.h"
 
-#include "../../../libraries/pico_explorer/pico_explorer.hpp"
+#include "libraries/pico_explorer/pico_explorer.hpp"
 
 using namespace pimoroni;
 
diff --git a/micropython/modules/pico_rgb_keypad/pico_rgb_keypad.cpp b/micropython/modules/pico_rgb_keypad/pico_rgb_keypad.cpp
index 2a95402c..36c38c2a 100644
--- a/micropython/modules/pico_rgb_keypad/pico_rgb_keypad.cpp
+++ b/micropython/modules/pico_rgb_keypad/pico_rgb_keypad.cpp
@@ -2,7 +2,7 @@
 #include "hardware/sync.h"
 #include "pico/binary_info.h"
 
-#include "../../../libraries/pico_rgb_keypad/pico_rgb_keypad.hpp"
+#include "libraries/pico_rgb_keypad/pico_rgb_keypad.hpp"
 
 using namespace pimoroni;
 
diff --git a/micropython/modules/pico_scroll/pico_scroll.cpp b/micropython/modules/pico_scroll/pico_scroll.cpp
index 2715e45c..fe6cd88c 100644
--- a/micropython/modules/pico_scroll/pico_scroll.cpp
+++ b/micropython/modules/pico_scroll/pico_scroll.cpp
@@ -3,7 +3,7 @@
 #include "pico/binary_info.h"
 #include "pico/stdlib.h"
 
-#include "../../../libraries/pico_scroll/pico_scroll.hpp"
+#include "libraries/pico_scroll/pico_scroll.hpp"
 
 using namespace pimoroni;
 
diff --git a/micropython/modules/pico_unicorn/pico_unicorn.cpp b/micropython/modules/pico_unicorn/pico_unicorn.cpp
index 2e15e715..59e3e525 100644
--- a/micropython/modules/pico_unicorn/pico_unicorn.cpp
+++ b/micropython/modules/pico_unicorn/pico_unicorn.cpp
@@ -2,7 +2,7 @@
 #include "hardware/sync.h"
 #include "pico/binary_info.h"
 
-#include "../../../libraries/pico_unicorn/pico_unicorn.hpp"
+#include "libraries/pico_unicorn/pico_unicorn.hpp"
 
 using namespace pimoroni;
 
diff --git a/micropython/modules/pico_wireless/pico_wireless.cpp b/micropython/modules/pico_wireless/pico_wireless.cpp
index 450b6de4..10ec8c44 100644
--- a/micropython/modules/pico_wireless/pico_wireless.cpp
+++ b/micropython/modules/pico_wireless/pico_wireless.cpp
@@ -2,7 +2,7 @@
 #include "hardware/sync.h"
 #include "pico/binary_info.h"
 
-#include "../../../libraries/pico_wireless/pico_wireless.hpp"
+#include "libraries/pico_wireless/pico_wireless.hpp"
 
 using namespace pimoroni;