Skip to content

Compile under esp-idf new build sysytem #1562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Compile under esp-idf new build sysytem #1562

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8dfab8
component.mk added - to make esp-idf build system happy
qt1 Jul 23, 2018
0577b89
fix include path
qt1 Aug 23, 2018
d3664c6
esp-idf make system
qt1 Oct 4, 2019
b166cf9
Merge branch '6.x' of https://github.com/qt1/ArduinoJson
qt1 Oct 5, 2019
e53142a
Merge commit '1360b6a396e096365c917a5518cf29aeac6c9444'
qt1 Jan 13, 2021
4e9e0fb
Merge branch 'bblanchon:6.x' into master
qt1 May 19, 2021
66a8e9f
Support compiling as esp-idf component
qt1 May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@

cmake_minimum_required(VERSION 3.0)

if(ESP_PLATFORM)
# Build ArduinoJson as an ESP-IDF component
idf_component_register(INCLUDE_DIRS src)
target_compile_definitions(${COMPONENT_LIB} INTERFACE ARDUINOJSON_EMBEDDED_MODE=1)
return()
endif()

project(ArduinoJson VERSION 6.18.0)

if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
Expand Down