From 376559d14cb4905255562814794e9fa119dfdb55 Mon Sep 17 00:00:00 2001
From: Jakob Hasse <jakob.hasse@espressif.com>
Date: Thu, 19 Aug 2021 14:54:11 +0800
Subject: [PATCH] [cmake]: fixed FPGA setting during early build

---
 tools/cmake/idf.cmake     | 7 +++++++
 tools/cmake/targets.cmake | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/cmake/idf.cmake b/tools/cmake/idf.cmake
index 547473f22b..ea096b96c1 100644
--- a/tools/cmake/idf.cmake
+++ b/tools/cmake/idf.cmake
@@ -49,5 +49,12 @@ if(NOT __idf_env_set)
 
     __build_init("${idf_path}")
 
+    # Check if IDF_ENV_FPGA environment is set
+    set(env_idf_env_fpga $ENV{IDF_ENV_FPGA})
+    if(${env_idf_env_fpga})
+        idf_build_set_property(__IDF_ENV_FPGA "y")
+        message(NOTICE "IDF_ENV_FPGA is set, building for FPGA environment")
+    endif()
+
     set_property(GLOBAL PROPERTY __IDF_ENV_SET 1)
 endif()
diff --git a/tools/cmake/targets.cmake b/tools/cmake/targets.cmake
index 22df06abcd..ecaaaf1818 100644
--- a/tools/cmake/targets.cmake
+++ b/tools/cmake/targets.cmake
@@ -27,13 +27,6 @@ macro(__target_init)
 
     # Finally, set IDF_TARGET in cache
     set(IDF_TARGET ${env_idf_target} CACHE STRING "IDF Build Target")
-
-    # Check if IDF_ENV_FPGA environment is set
-    set(env_idf_env_fpga $ENV{IDF_ENV_FPGA})
-    if(${env_idf_env_fpga})
-        idf_build_set_property(__IDF_ENV_FPGA "y")
-        message(NOTICE "IDF_ENV_FPGA is set, building for FPGA environment")
-    endif()
 endmacro()
 
 #