Przeglądaj źródła

Merge pull request #13 from thingsconnected/pullreq2

CMakeLists.txt: fix dependencies to allow make -j
Brian Starkey 6 miesięcy temu
rodzic
commit
898634304f
No account linked to committer's email address
1 zmienionych plików z 4 dodań i 4 usunięć
  1. 4
    4
      CMakeLists.txt

+ 4
- 4
CMakeLists.txt Wyświetl plik

@@ -142,14 +142,14 @@ function(picowota_build_combined NAME)
142 142
 	pico_set_linker_script(picowota ${PICOWOTA_SRC_DIR}/bootloader_shell.ld)
143 143
 
144 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 147
 		COMMAND ${PICOWOTA_SRC_DIR}/gen_imghdr.py -a 0x1005B000 ${APP_BIN} ${APP_HDR_BIN}
148 148
 	)
149 149
 
150 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 153
 		COMMAND ${CMAKE_OBJCOPY}
154 154
 			--update-section .app_hdr=${APP_HDR_BIN}
155 155
 			--update-section .app_bin=${APP_BIN} ${PICOWOTA_BIN_DIR}/picowota.elf ${COMBINED}.elf

Ładowanie…
Anuluj
Zapisz