Skip to content

Commit

Permalink
Fix picotool_DIR passing to universal build
Browse files Browse the repository at this point in the history
Fixes #531
  • Loading branch information
will-v-pi committed Aug 27, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 816a198 commit 15bc1a6
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion universal/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -48,6 +48,11 @@ function (add_universal_target TARGET SOURCE)
endif()

add_custom_target(${TARGET} ALL)
if (picotool_DIR)
set(universal_picotool_DIR ${picotool_DIR})
else()
set(universal_picotool_DIR ${picotool_INSTALL_DIR}/picotool)
endif()

set(DEPS "")
set(BINS "")
@@ -70,7 +75,7 @@ function (add_universal_target TARGET SOURCE)
"-DUNIVERSAL_PROJECT_DIR:FILEPATH=${SOURCE}"
"-DUNIVERSAL_BINARY_DIR:FILEPATH=${CMAKE_CURRENT_BINARY_DIR}/${TARGET}/${platform}"
"-DSOURCE_TARGET=${SOURCE_TARGET}"
"-Dpicotool_DIR=${picotool_INSTALL_DIR}/picotool"
"-Dpicotool_DIR=${universal_picotool_DIR}"
"-Dpioasm_DIR=${PIOASM_INSTALL_DIR}/pioasm"
BUILD_ALWAYS 1 # force dependency checking
INSTALL_COMMAND ""

0 comments on commit 15bc1a6

Please sign in to comment.