Skip to content

Commit 03461f2

Browse files
committed
Remove incorrect inverted dependency on Pioasm which broke Ninja build
1 parent 13f89f6 commit 03461f2

File tree

3 files changed

+36
-2
lines changed

3 files changed

+36
-2
lines changed

hello_world/serial/CMakeLists.txt

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,38 @@ pico_add_extra_outputs(hello_serial)
1010

1111
# add url via pico_set_program_url
1212
example_auto_set_url(hello_serial)
13+
14+
add_executable(hello_serial_noflash
15+
hello_serial.c
16+
)
17+
18+
# Pull in our pico_stdlib which aggregates commonly used features
19+
target_link_libraries(hello_serial_noflash pico_stdlib)
20+
21+
# create map/bin/hex/uf2 file etc.
22+
pico_add_extra_outputs(hello_serial_noflash)
23+
pico_set_binary_type(hello_serial_noflash no_flash)
24+
25+
add_executable(hello_serial_ctr
26+
hello_serial.c
27+
)
28+
29+
# Pull in our pico_stdlib which aggregates commonly used features
30+
target_link_libraries(hello_serial_ctr pico_stdlib)
31+
32+
# create map/bin/hex/uf2 file etc.
33+
pico_add_extra_outputs(hello_serial_ctr)
34+
pico_set_binary_type(hello_serial_ctr copy_to_ram)
35+
36+
add_executable(hello_serial_br
37+
hello_serial.c
38+
)
39+
40+
# Pull in our pico_stdlib which aggregates commonly used features
41+
target_link_libraries(hello_serial_br pico_stdlib)
42+
43+
# create map/bin/hex/uf2 file etc.
44+
#pico_add_extra_outputs(hello_serial_br)
45+
pico_set_binary_type(hello_serial_br blocked_ram)
46+
47+

pio/squarewave/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ example_auto_set_url(pio_squarewave)
1515
# generate .hex file and .pio.h file for the RP2040 datasheet (to make sure
1616
# the datasheet always shows the output of the latest pioasm version)
1717
add_custom_target(pio_squarewave_datasheet DEPENDS
18-
Pioasm
1918
${CMAKE_CURRENT_LIST_DIR}/generated/squarewave.hex
2019
${CMAKE_CURRENT_LIST_DIR}/generated/squarewave.pio.h
2120
${CMAKE_CURRENT_LIST_DIR}/generated/squarewave_wrap.pio.h

pio/ws2812/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pico_add_extra_outputs(pio_ws2812_parallel)
2727
example_auto_set_url(pio_ws2812_parallel)
2828

2929
# Additionally generate python and hex pioasm outputs for inclusion in the RP2040 datasheet
30-
add_custom_target(pio_ws2812_datasheet DEPENDS Pioasm ${CMAKE_CURRENT_LIST_DIR}/generated/ws2812.py)
30+
add_custom_target(pio_ws2812_datasheet DEPENDS ${CMAKE_CURRENT_LIST_DIR}/generated/ws2812.py)
3131
add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/generated/ws2812.py
3232
DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ws2812.pio
3333
COMMAND Pioasm -o python ${CMAKE_CURRENT_LIST_DIR}/ws2812.pio ${CMAKE_CURRENT_LIST_DIR}/generated/ws2812.py

0 commit comments

Comments
 (0)