Fixup pimoroni-pico paths.

pimoroni · Dec 2, 2024 · f7c3201 · f7c3201
1 parent 1bd6868
commit f7c3201
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/boards/usermod-common.cmake b/boards/usermod-common.cmake
@@ -6,15 +6,12 @@ include(${PIMORONI_PICO_PATH}/pimoroni_pico_import.cmake)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../../)
 include_directories(${PIMORONI_PICO_PATH}/micropython)
 
-list(APPEND CMAKE_MODULE_PATH "${PIMORONI_PICO_PATH}/micropython")
-list(APPEND CMAKE_MODULE_PATH "${PIMORONI_PICO_PATH}/micropython/modules")
-
 # Drivers, etc
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../pimoroni-pico")
+list(APPEND CMAKE_MODULE_PATH "${PIMORONI_PICO_PATH}")
 # modules_py/modules_py
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../pimoroni-pico/micropython")
+list(APPEND CMAKE_MODULE_PATH "${PIMORONI_PICO_PATH}/micropython")
 # All regular modules
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../pimoroni-pico/micropython/modules")
+list(APPEND CMAKE_MODULE_PATH "${PIMORONI_PICO_PATH}/micropython/modules")
 
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)

diff --git a/ci/micropython.sh b/ci/micropython.sh
@@ -102,6 +102,7 @@ function ci_cmake_configure {
     -DPICOTOOL_FORCE_FETCH_FROM_GIT=1 \
     -DPICO_BUILD_DOCS=0 \
     -DPICO_NO_COPRO_DIS=1 \
+    -DPIMORONI_PICO_PATH="$CI_BUILD_ROOT/pimoroni-pico" \
     -DUSER_C_MODULES="$MICROPY_BOARD_DIR/usermodules.cmake" \
     -DMICROPY_BOARD_DIR="$MICROPY_BOARD_DIR" \
     -DMICROPY_BOARD="$BOARD" \