Skip to content

Commit f58ac00

Browse files
committed
Fix build with precompiled
1 parent 252ef6e commit f58ac00

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ if (NOT DEFINED USE_PRECOMPILED)
6262
set(USE_PRECOMPILED true)
6363
endif()
6464

65+
if (USE_PRECOMPILED)
66+
set(EXTERNAL_PROJECT_INSTALL_COMMAND "")
67+
else()
68+
set(EXTERNAL_PROJECT_INSTALL_COMMAND ${CMAKE_COMMAND} --install .)
69+
endif()
70+
6571
# compile enc_bootloader.elf
6672
ExternalProject_Add(enc_bootloader
6773
PREFIX enc_bootloader
@@ -74,6 +80,7 @@ ExternalProject_Add(enc_bootloader
7480
"-DUSE_MBEDTLS=0"
7581
"-DPICO_DEBUG_INFO_IN_RELEASE=OFF"
7682
BUILD_ALWAYS 1 # todo remove this
83+
INSTALL_COMMAND "${EXTERNAL_PROJECT_INSTALL_COMMAND}"
7784
)
7885

7986
set(ENC_BOOTLOADER_ELF ${CMAKE_BINARY_DIR}/enc_bootloader/enc_bootloader.elf)
@@ -90,6 +97,7 @@ if (TARGET mbedtls)
9097
"-DUSE_MBEDTLS=1"
9198
"-DPICO_DEBUG_INFO_IN_RELEASE=OFF"
9299
BUILD_ALWAYS 1 # todo remove this
100+
INSTALL_COMMAND "${EXTERNAL_PROJECT_INSTALL_COMMAND}"
93101
)
94102

95103
set(ENC_BOOTLOADER_MBEDTLS_ELF ${CMAKE_BINARY_DIR}/enc_bootloader_mbedtls/enc_bootloader.elf)
@@ -107,6 +115,7 @@ if (NOT PICOTOOL_NO_LIBUSB)
107115
"-DUSE_PRECOMPILED:BOOL=${USE_PRECOMPILED}"
108116
"-DPICO_DEBUG_INFO_IN_RELEASE=OFF"
109117
BUILD_ALWAYS 1 # todo remove this
118+
INSTALL_COMMAND "${EXTERNAL_PROJECT_INSTALL_COMMAND}"
110119
)
111120

112121
set(XIP_RAM_PERMS_ELF ${CMAKE_BINARY_DIR}/xip_ram_perms/xip_ram_perms.elf)
@@ -122,6 +131,7 @@ if (NOT PICOTOOL_NO_LIBUSB)
122131
"-DUSE_PRECOMPILED:BOOL=${USE_PRECOMPILED}"
123132
"-DPICO_DEBUG_INFO_IN_RELEASE=OFF"
124133
BUILD_ALWAYS 1 # todo remove this
134+
INSTALL_COMMAND "${EXTERNAL_PROJECT_INSTALL_COMMAND}"
125135
)
126136

127137
set(FLASH_ID_BIN ${CMAKE_BINARY_DIR}/picoboot_flash_id/flash_id.bin)

0 commit comments

Comments
 (0)