Skip to content

Commit 3ea8bbd

Browse files
committed
Fixup no libusb build
1 parent ce318d1 commit 3ea8bbd

File tree

1 file changed

+31
-30
lines changed

1 file changed

+31
-30
lines changed

CMakeLists.txt

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,39 @@ endif()
5757

5858
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
5959

60+
if (NOT DEFINED USE_PRECOMPILED)
61+
set(USE_PRECOMPILED true)
62+
endif()
63+
64+
# compile enc_bootloader.elf
65+
if (NOT DEFINED USE_PRECOMPILED)
66+
set(USE_PRECOMPILED true)
67+
endif()
68+
ExternalProject_Add(enc_bootloader
69+
PREFIX enc_bootloader
70+
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/enc_bootloader
71+
BINARY_DIR ${CMAKE_BINARY_DIR}/enc_bootloader
72+
CMAKE_ARGS
73+
"-DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}"
74+
"-DPICO_SDK_PATH:FILEPATH=${PICO_SDK_PATH}"
75+
"-DUSE_PRECOMPILED:BOOL=${USE_PRECOMPILED}"
76+
"-DPICO_DEBUG_INFO_IN_RELEASE=OFF"
77+
BUILD_ALWAYS 1 # todo remove this
78+
INSTALL_COMMAND ""
79+
)
80+
81+
set(ENC_BOOTLOADER_ELF ${CMAKE_BINARY_DIR}/enc_bootloader/enc_bootloader.elf)
82+
add_executable(enc_bootloader_elf IMPORTED)
83+
add_dependencies(enc_bootloader_elf enc_bootloader)
84+
set_property(TARGET enc_bootloader_elf PROPERTY IMPORTED_LOCATION ${ENC_BOOTLOADER_ELF})
85+
# copy enc_bootloader.elf into build directory
86+
add_custom_command(TARGET enc_bootloader
87+
COMMAND ${CMAKE_COMMAND} -E copy ${ENC_BOOTLOADER_ELF} ${CMAKE_BINARY_DIR}/enc_bootloader.elf
88+
DEPENDS enc_bootloader
89+
)
90+
6091
if (NOT PICOTOOL_NO_LIBUSB)
6192
# compile xip_ram_perms.elf
62-
if (NOT DEFINED USE_PRECOMPILED)
63-
set(USE_PRECOMPILED true)
64-
endif()
6593
ExternalProject_Add(xip_ram_perms
6694
PREFIX xip_ram_perms
6795
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/xip_ram_perms
@@ -85,33 +113,6 @@ if (NOT PICOTOOL_NO_LIBUSB)
85113
DEPENDS xip_ram_perms
86114
)
87115

88-
# compile enc_bootloader.elf
89-
if (NOT DEFINED USE_PRECOMPILED)
90-
set(USE_PRECOMPILED true)
91-
endif()
92-
ExternalProject_Add(enc_bootloader
93-
PREFIX enc_bootloader
94-
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/enc_bootloader
95-
BINARY_DIR ${CMAKE_BINARY_DIR}/enc_bootloader
96-
CMAKE_ARGS
97-
"-DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}"
98-
"-DPICO_SDK_PATH:FILEPATH=${PICO_SDK_PATH}"
99-
"-DUSE_PRECOMPILED:BOOL=${USE_PRECOMPILED}"
100-
"-DPICO_DEBUG_INFO_IN_RELEASE=OFF"
101-
BUILD_ALWAYS 1 # todo remove this
102-
INSTALL_COMMAND ""
103-
)
104-
105-
set(ENC_BOOTLOADER_ELF ${CMAKE_BINARY_DIR}/enc_bootloader/enc_bootloader.elf)
106-
add_executable(enc_bootloader_elf IMPORTED)
107-
add_dependencies(enc_bootloader_elf enc_bootloader)
108-
set_property(TARGET enc_bootloader_elf PROPERTY IMPORTED_LOCATION ${ENC_BOOTLOADER_ELF})
109-
# copy enc_bootloader.elf into build directory
110-
add_custom_command(TARGET enc_bootloader
111-
COMMAND ${CMAKE_COMMAND} -E copy ${ENC_BOOTLOADER_ELF} ${CMAKE_BINARY_DIR}/enc_bootloader.elf
112-
DEPENDS enc_bootloader
113-
)
114-
115116
# compile flash_id
116117
ExternalProject_Add(flash_id
117118
PREFIX picoboot_flash_id

0 commit comments

Comments
 (0)