diff options
| -rw-r--r-- | lib/mpack/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/pbdrv/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | main/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | puzzle/dummy/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | puzzle/neo/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | puzzle/smoketest/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | puzzle/vault/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 4 |
8 files changed, 20 insertions, 20 deletions
diff --git a/lib/mpack/CMakeLists.txt b/lib/mpack/CMakeLists.txt index 4badc7b..7716bce 100644 --- a/lib/mpack/CMakeLists.txt +++ b/lib/mpack/CMakeLists.txt @@ -19,11 +19,11 @@ add_library(mpack STATIC src/src/mpack/mpack-reader.c src/src/mpack/mpack-writer.c read-remaining.c - ) +) target_include_directories(mpack SYSTEM INTERFACE . src/src/mpack - ) +) # causes some wild crashes, please leave off target_compile_definitions(mpack PRIVATE MPACK_READ_TRACKING=0) diff --git a/lib/pbdrv/CMakeLists.txt b/lib/pbdrv/CMakeLists.txt index 903a3b4..4fb61d4 100644 --- a/lib/pbdrv/CMakeLists.txt +++ b/lib/pbdrv/CMakeLists.txt @@ -21,7 +21,7 @@ add_library(pbdrv STATIC pb-msg.c pb-serial.c pb-buf.c - ) +) target_include_directories(pbdrv SYSTEM INTERFACE .) target_link_libraries(pbdrv PRIVATE mpack) @@ -30,7 +30,7 @@ add_library(pbdrv-mod OBJECT pb-mod.c pb-send.c pb-route.c - ) +) target_include_directories(pbdrv-mod SYSTEM INTERFACE .) target_link_libraries(pbdrv-mod PUBLIC pbdrv) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 76b1244..d9782e8 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -23,7 +23,7 @@ add_executable(main mod.c tasks.c blink.c - ) +) pico_enable_stdio_usb(main 1) pico_enable_stdio_uart(main 0) @@ -42,5 +42,5 @@ target_link_libraries(main PUBLIC i2ctcp mpack pbdrv-mod - ) +) diff --git a/puzzle/dummy/CMakeLists.txt b/puzzle/dummy/CMakeLists.txt index 7edce2b..f5666cb 100644 --- a/puzzle/dummy/CMakeLists.txt +++ b/puzzle/dummy/CMakeLists.txt @@ -34,15 +34,15 @@ add_subdirectory(lib/FreeRTOS-Kernel) add_executable(main main.cpp mod.c - ) +) target_link_libraries(main PUBLIC pbdrv-mod - ) +) target_link_arduino_libraries(main PUBLIC core Wire - ) +) target_enable_arduino_upload(main) diff --git a/puzzle/neo/CMakeLists.txt b/puzzle/neo/CMakeLists.txt index 6c45f13..d5e7353 100644 --- a/puzzle/neo/CMakeLists.txt +++ b/puzzle/neo/CMakeLists.txt @@ -26,16 +26,16 @@ add_subdirectory(lib/FreeRTOS-Kernel) add_executable(main main.cpp mod.c - ) +) target_link_libraries(main PUBLIC pbdrv-mod - ) +) target_link_arduino_libraries(main PUBLIC core Wire Adafruit_seesaw - ) +) # fugly workaround target_link_arduino_libraries(_arduino_lib_Adafruit_seesaw_Library PUBLIC "Adafruit BusIO") diff --git a/puzzle/smoketest/CMakeLists.txt b/puzzle/smoketest/CMakeLists.txt index b71825f..9f2bd72 100644 --- a/puzzle/smoketest/CMakeLists.txt +++ b/puzzle/smoketest/CMakeLists.txt @@ -27,15 +27,15 @@ add_subdirectory(lib/FreeRTOS-Kernel) add_executable(main main.cpp mod.c - ) +) target_link_libraries(main PUBLIC pbdrv-mod - ) +) target_link_arduino_libraries(main PUBLIC core Wire - ) +) target_enable_arduino_upload(main) diff --git a/puzzle/vault/CMakeLists.txt b/puzzle/vault/CMakeLists.txt index bc13c8c..8f21eb4 100644 --- a/puzzle/vault/CMakeLists.txt +++ b/puzzle/vault/CMakeLists.txt @@ -26,16 +26,16 @@ add_subdirectory(lib/FreeRTOS-Kernel) add_executable(main main.cpp mod.c - ) +) target_link_libraries(main PUBLIC pbdrv-mod - ) +) target_link_arduino_libraries(main PUBLIC core Wire TM1637 - ) +) target_enable_arduino_upload(main) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1ec0cc6..330f497 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,7 +13,7 @@ add_executable(test pbdrv/pb-route.c pbdrv/msg.cpp pbdrv/mod.c - ) +) add_subdirectory(lib/googletest) add_subdirectory(lib/pbdrv) @@ -25,5 +25,5 @@ target_link_libraries(test i2ctcp mpack pbdrv-mod - ) +) |