From 948795265d7f671431ad2a6f73ed4737a727e681 Mon Sep 17 00:00:00 2001
From: Renz Bagaporo <renz.bagaporo@espressif.com>
Date: Mon, 4 May 2020 20:56:40 +0800
Subject: [PATCH 1/3] ci: test idf_build_process defaults set properly

---
 tools/ci/test_build_system_cmake.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh
index 81f00a5547..a1be54e4ae 100755
--- a/tools/ci/test_build_system_cmake.sh
+++ b/tools/ci/test_build_system_cmake.sh
@@ -592,6 +592,20 @@ endmenu\n" >> ${IDF_PATH}/Kconfig;
         || failure "Version on worktree should have been properly resolved"
     git worktree remove ../esp-idf-template-test
 
+    print_status "Defaults set properly for unspecified idf_build_process args"
+    pushd .
+    cd $IDF_PATH/examples/build_system/cmake/idf_as_lib
+    cp CMakeLists.txt CMakeLists.txt.bak
+    echo -e "\nidf_build_get_property(project_dir PROJECT_DIR)" >> CMakeLists.txt
+    echo -e "\nmessage(\"Project directory: \${project_dir}\")" >> CMakeLists.txt
+    mkdir build && cd build
+    cmake .. -DCMAKE_TOOLCHAIN_FILE=$IDF_PATH/tools/cmake/toolchain-esp32.cmake -DTARGET=esp32 &> log.txt
+    grep "Project directory: $IDF_PATH/examples/build_system/cmake/idf_as_lib" log.txt || failure "PROJECT_DIR default was not set"
+    cd ..
+    mv CMakeLists.txt.bak CMakeLists.txt
+    rm -rf build
+    popd
+
     print_status "All tests completed"
     if [ -n "${FAILURES}" ]; then
         echo "Some failures were detected:"

From d30f3b6edde158f4361b3f3223e92d2dc1438630 Mon Sep 17 00:00:00 2001
From: Renz Bagaporo <renz.bagaporo@espressif.com>
Date: Wed, 29 Apr 2020 14:07:23 +0800
Subject: [PATCH 2/3] cmake: fix setting defaults in idf_build_process

Closes https://github.com/espressif/esp-idf/issues/5053
---
 tools/cmake/build.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cmake/build.cmake b/tools/cmake/build.cmake
index bbd4d16fe9..e89e114e01 100644
--- a/tools/cmake/build.cmake
+++ b/tools/cmake/build.cmake
@@ -313,7 +313,7 @@ endmacro()
 #
 macro(__build_set_default var default)
     set(_var __${var})
-    if(NOT "${_var}" STREQUAL "")
+    if(NOT "${${_var}}" STREQUAL "")
         idf_build_set_property(${var} "${${_var}}")
     else()
         idf_build_set_property(${var} "${default}")

From 34f4b5a4d36723a54e1ae174bde6f91405760330 Mon Sep 17 00:00:00 2001
From: Renz Christian Bagaporo <renz@espressif.com>
Date: Thu, 14 May 2020 16:26:52 +0800
Subject: [PATCH 3/3] ci: pushd and cd in one go in idf_build_process defaults
 test

---
 tools/ci/test_build_system_cmake.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh
index a1be54e4ae..43f64fd37e 100755
--- a/tools/ci/test_build_system_cmake.sh
+++ b/tools/ci/test_build_system_cmake.sh
@@ -593,8 +593,7 @@ endmenu\n" >> ${IDF_PATH}/Kconfig;
     git worktree remove ../esp-idf-template-test
 
     print_status "Defaults set properly for unspecified idf_build_process args"
-    pushd .
-    cd $IDF_PATH/examples/build_system/cmake/idf_as_lib
+    pushd $IDF_PATH/examples/build_system/cmake/idf_as_lib
     cp CMakeLists.txt CMakeLists.txt.bak
     echo -e "\nidf_build_get_property(project_dir PROJECT_DIR)" >> CMakeLists.txt
     echo -e "\nmessage(\"Project directory: \${project_dir}\")" >> CMakeLists.txt