use idf in build

2 years ago · ddcbcad6d4
parent 6d6628c98a
commit ddcbcad6d4
2 changed files with 1 additions and 5 deletions
--- 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

--- 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 "")