From ddcbcad6d4771e0ec8228dc1848ebd1dfe303a0b Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 17 Nov 2022 13:52:59 +1100 Subject: [PATCH] use idf in build --- .env | 3 +-- common.cmake | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.env b/.env index d6f9345a..b53f45eb 100644 --- a/.env +++ b/.env @@ -1,6 +1,5 @@ repo_dir=$(cd "$(dirname "$_")" && pwd) export PROJ_PATH=$repo_dir -export ADF_PATH=$repo_dir/lib/esp-adf -export IDF_PATH=$ADF_PATH/esp-idf +export IDF_PATH=$repo_dir/lib/esp-idf . $IDF_PATH/export.sh diff --git a/common.cmake b/common.cmake index 7a947fdf..53a6a243 100644 --- a/common.cmake +++ b/common.cmake @@ -3,9 +3,6 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -# ESP-ADF clobbers EXTRA_COMPONENT_DIRS, so include it first. -include($ENV{ADF_PATH}/CMakeLists.txt) - # Build only the subset of components that we actually depend on. set(COMPONENTS "")