瀏覽代碼

Merge pull request #17 from thingsconnected/pullreq6

fix dependencies (again)
Brian Starkey 6 月之前
父節點
當前提交
ac8960b274
沒有連結到貢獻者的電子郵件帳戶。
共有 1 個檔案被更改,包括 3 行新增3 行删除
  1. 3
    3
      CMakeLists.txt

+ 3
- 3
CMakeLists.txt 查看文件

141
 	# Build the bootloader with the sections to fill in
141
 	# Build the bootloader with the sections to fill in
142
 	pico_set_linker_script(picowota ${PICOWOTA_SRC_DIR}/bootloader_shell.ld)
142
 	pico_set_linker_script(picowota ${PICOWOTA_SRC_DIR}/bootloader_shell.ld)
143
 
143
 
144
-	add_custom_target(${NAME}_hdr DEPENDS ${NAME})
145
-	add_custom_command(TARGET ${NAME}_hdr DEPENDS ${NAME} picowota
144
+	add_custom_target(${NAME}_hdr DEPENDS ${NAME} picowota)
145
+	add_custom_command(TARGET ${NAME}_hdr
146
 		COMMAND ${PICOWOTA_SRC_DIR}/gen_imghdr.py --map ${PICOWOTA_BIN_DIR}/picowota.elf.map --section .app_bin ${APP_BIN} ${APP_HDR_BIN}
146
 		COMMAND ${PICOWOTA_SRC_DIR}/gen_imghdr.py --map ${PICOWOTA_BIN_DIR}/picowota.elf.map --section .app_bin ${APP_BIN} ${APP_HDR_BIN}
147
 	)
147
 	)
148
 
148
 
149
 	add_custom_target(${COMBINED} ALL)
149
 	add_custom_target(${COMBINED} ALL)
150
 	add_dependencies(${COMBINED} picowota ${NAME}_hdr)
150
 	add_dependencies(${COMBINED} picowota ${NAME}_hdr)
151
-	add_custom_command(TARGET ${COMBINED} DEPENDS ${NAME}_hdr
151
+	add_custom_command(TARGET ${COMBINED}
152
 		COMMAND ${CMAKE_OBJCOPY}
152
 		COMMAND ${CMAKE_OBJCOPY}
153
 			--update-section .app_hdr=${APP_HDR_BIN}
153
 			--update-section .app_hdr=${APP_HDR_BIN}
154
 			--update-section .app_bin=${APP_BIN} ${PICOWOTA_BIN_DIR}/picowota.elf ${COMBINED}.elf
154
 			--update-section .app_bin=${APP_BIN} ${PICOWOTA_BIN_DIR}/picowota.elf ${COMBINED}.elf

Loading…
取消
儲存