From 5a3f2244052d2390ed2fc2c842ea6c983e0972cb Mon Sep 17 00:00:00 2001 From: David Antliff Date: Tue, 7 Apr 2020 16:58:35 +1200 Subject: [PATCH] Add CMake logic to support both IDF v3.3 and v4.x. --- CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 051f8ec..31da009 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,5 +5,15 @@ cmake_minimum_required(VERSION 3.5) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(esp32-ds18b20-example) +if (NOT IDF_VERSION_MAJOR) + set(IDF_VERSION_MAJOR 3) +endif() + +if (IDF_VERSION_MAJOR GREATER 3) + set(PROJECT_ELF ${project_elf}) +else() + set(PROJECT_ELF ${IDF_PROJECT_EXECUTABLE}) +endif() + # Ignore false clang warnings about `struct foo = { 0 }` -target_compile_options(${project_elf} PRIVATE -Wno-missing-braces -Wmissing-field-initializers) +target_compile_options(${PROJECT_ELF} PRIVATE -Wno-missing-braces -Wmissing-field-initializers)