From 64f8fe2f30b5a25fa630c6fd5f0fd95a866a008d Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Tue, 1 Nov 2022 11:26:36 +0000 Subject: [PATCH] Support v5 in cmake builds --- cmake/components/rust-{{project-name}}/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/components/rust-{{project-name}}/CMakeLists.txt b/cmake/components/rust-{{project-name}}/CMakeLists.txt index 9d3fc87..ad31b63 100644 --- a/cmake/components/rust-{{project-name}}/CMakeLists.txt +++ b/cmake/components/rust-{{project-name}}/CMakeLists.txt @@ -36,6 +36,10 @@ set(CARGO_BUILD_STD_ARG -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_i set(CARGO_BUILD_STD_ARG -Zbuild-std=core,alloc,panic_abort -Zbuild-std-features=panic_immediate_abort) {% endif %} +if(IDF_VERSION_MAJOR > 4) +set(ESP_RUSTFLAGS "--cfg espidf_time64") +endif() + set(CARGO_PROJECT_DIR "${CMAKE_CURRENT_LIST_DIR}") set(CARGO_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}") set(CARGO_TARGET_DIR "${CARGO_BUILD_DIR}/target") @@ -63,6 +67,7 @@ ExternalProject_Add( CARGO_CMAKE_BUILD_SDKCONFIG=${sdkconfig} CARGO_CMAKE_BUILD_ESP_IDF=${idf_path} CARGO_CMAKE_BUILD_COMPILER=${CMAKE_C_COMPILER} + RUSTFLAGS=${ESP_RUSTFLAGS} cargo build --target ${RUST_TARGET} --target-dir ${CARGO_TARGET_DIR} ${CARGO_BUILD_ARG} ${CARGO_BUILD_STD_ARG} INSTALL_COMMAND "" BUILD_ALWAYS TRUE