From 2d4e3baa82a4f576cda80a9aadf2aacf17ee431f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20T=C3=B4rres?= <t0rr3sp3dr0@gmail.com>
Date: Sun, 16 Oct 2022 19:31:58 -0300
Subject: [PATCH] Set CMAKE_MAKE_PROGRAM when building ELF2UF2 and PIOASM
 (#935)

---
 tools/FindELF2UF2.cmake | 4 +++-
 tools/FindPioasm.cmake  | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/FindELF2UF2.cmake b/tools/FindELF2UF2.cmake
index fb5dd97..e9ced68 100644
--- a/tools/FindELF2UF2.cmake
+++ b/tools/FindELF2UF2.cmake
@@ -24,8 +24,10 @@ if (NOT ELF2UF2_FOUND)
     if (NOT TARGET ${ELF2UF2_BUILD_TARGET})
         pico_message_debug("ELF2UF2 will need to be built")
         ExternalProject_Add(${ELF2UF2_BUILD_TARGET}
-                PREFIX elf2uf2 SOURCE_DIR ${ELF2UF2_SOURCE_DIR}
+                PREFIX elf2uf2
+                SOURCE_DIR ${ELF2UF2_SOURCE_DIR}
                 BINARY_DIR ${ELF2UF2_BINARY_DIR}
+                CMAKE_ARGS "-DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}"
                 BUILD_ALWAYS 1 # force dependency checking
                 INSTALL_COMMAND ""
                 )
diff --git a/tools/FindPioasm.cmake b/tools/FindPioasm.cmake
index 0cc9fe4..d7bebdf 100644
--- a/tools/FindPioasm.cmake
+++ b/tools/FindPioasm.cmake
@@ -25,11 +25,13 @@ if (NOT Pioasm_FOUND)
         pico_message_debug("PIOASM will need to be built")
 #        message("Adding external project ${PioasmBuild_Target} in ${CMAKE_CURRENT_LIST_DIR}}")
         ExternalProject_Add(${PioasmBuild_TARGET}
-                PREFIX pioasm SOURCE_DIR ${PIOASM_SOURCE_DIR}
+                PREFIX pioasm
+                SOURCE_DIR ${PIOASM_SOURCE_DIR}
                 BINARY_DIR ${PIOASM_BINARY_DIR}
+                CMAKE_ARGS "-DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}"
+                CMAKE_CACHE_ARGS "-DPIOASM_EXTRA_SOURCE_FILES:STRING=${PIOASM_EXTRA_SOURCE_FILES}"
                 BUILD_ALWAYS 1 # force dependency checking
                 INSTALL_COMMAND ""
-                CMAKE_CACHE_ARGS "-DPIOASM_EXTRA_SOURCE_FILES:STRING=${PIOASM_EXTRA_SOURCE_FILES}"
                 )
     endif()