From 6d60bbe2541d8327aa8e4ec5cee8050136a5cfd1 Mon Sep 17 00:00:00 2001 From: folkert van heusden Date: Mon, 13 May 2024 20:50:03 +0200 Subject: [PATCH] replacing libjansson by arduinojson --- .gitmodules | 3 +++ CMakeLists.txt | 7 +++++++ arduinojson | 1 + 3 files changed, 11 insertions(+) create mode 160000 arduinojson diff --git a/.gitmodules b/.gitmodules index 416c72b..d64c66c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "ESP32/SHAdisplay"] path = ESP32/SHAdisplay url = https://github.com/krzychb/esp-epaper-29-dke +[submodule "arduinojson"] + path = arduinojson + url = https://github.com/bblanchon/ArduinoJson.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 721e03e..6bc82ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,3 +122,10 @@ target_link_libraries(kek-win32 Threads::Threads) target_link_libraries(kek-win32 ws2_32) endif () + +add_subdirectory(arduinojson) +target_link_libraries(kek ArduinoJson) + +if (WIN32) +target_link_libraries(kek-win32 ArduinoJson) +endif () diff --git a/arduinojson b/arduinojson new file mode 160000 index 0000000..071f718 --- /dev/null +++ b/arduinojson @@ -0,0 +1 @@ +Subproject commit 071f718473294344168357dcee130000c492ff8f