Ver código fonte

Merge pull request #13 from thingsconnected/pullreq2

CMakeLists.txt: fix dependencies to allow make -j
Brian Starkey 6 meses atrás
pai
commit
898634304f
Nenhuma conta vinculada ao e-mail do autor do commit
1 arquivos alterados com 4 adições e 4 exclusões
  1. 4
    4
      CMakeLists.txt

+ 4
- 4
CMakeLists.txt Ver arquivo

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
 	# TODO: The hard-coded address here is a bit nasty
144
 	# TODO: The hard-coded address here is a bit nasty
145
-	add_custom_target(${NAME}_hdr DEPENDS ${APP_BIN})
146
-	add_custom_command(TARGET ${NAME}_hdr DEPENDS ${APP_BIN}
145
+	add_custom_target(${NAME}_hdr DEPENDS ${NAME})
146
+	add_custom_command(TARGET ${NAME}_hdr DEPENDS ${NAME}
147
 		COMMAND ${PICOWOTA_SRC_DIR}/gen_imghdr.py -a 0x1005B000 ${APP_BIN} ${APP_HDR_BIN}
147
 		COMMAND ${PICOWOTA_SRC_DIR}/gen_imghdr.py -a 0x1005B000 ${APP_BIN} ${APP_HDR_BIN}
148
 	)
148
 	)
149
 
149
 
150
 	add_custom_target(${COMBINED} ALL)
150
 	add_custom_target(${COMBINED} ALL)
151
-	add_dependencies(${COMBINED} picowota ${NAME}_hdr ${NAME})
152
-	add_custom_command(TARGET ${COMBINED} DEPENDS ${APP_HDR_BIN} ${APP_BIN}
151
+	add_dependencies(${COMBINED} picowota ${NAME}_hdr)
152
+	add_custom_command(TARGET ${COMBINED} DEPENDS ${NAME}_hdr
153
 		COMMAND ${CMAKE_OBJCOPY}
153
 		COMMAND ${CMAKE_OBJCOPY}
154
 			--update-section .app_hdr=${APP_HDR_BIN}
154
 			--update-section .app_hdr=${APP_HDR_BIN}
155
 			--update-section .app_bin=${APP_BIN} ${PICOWOTA_BIN_DIR}/picowota.elf ${COMBINED}.elf
155
 			--update-section .app_bin=${APP_BIN} ${PICOWOTA_BIN_DIR}/picowota.elf ${COMBINED}.elf

Carregando…
Cancelar
Salvar