From f284381225fee4cbb6a10103de03f07d0b75b0a2 Mon Sep 17 00:00:00 2001
From: Sudeep Mohanty <sudeep.mohanty@espressif.com>
Date: Mon, 15 Sep 2025 14:35:59 +0200
Subject: [PATCH] feat(cmakev2): Reorganise build system initialization

This commit updates the order of initialization for build system v2. All
non-project initializations are handled in idf.cmake and all
project-specific initializations are now moved to idf_project_init().
---
 tools/cmakev2/idf.cmake     | 37 +++++--------------------------------
 tools/cmakev2/project.cmake | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/tools/cmakev2/idf.cmake b/tools/cmakev2/idf.cmake
index 25cf9f57b25..f84c595fa1b 100644
--- a/tools/cmakev2/idf.cmake
+++ b/tools/cmakev2/idf.cmake
@@ -587,38 +587,11 @@ __init_toolchain()
 # Enable ccache if requested.
 __init_ccache()
 
-# Discover and initialize components.
-__init_components()
+#[[
 
-# Generate initial sdkconfig with discovered components.
-__generate_sdkconfig()
-
-# Initialize the component manager and fetch components in a loop
-__fetch_components_from_registry()
-
-# Create Kconfig targets
-__create_kconfig_targets()
-
-# Include sdkconfig.cmake
-idf_build_get_property(sdkconfig_cmake __SDKCONFIG_CMAKE)
-if(NOT EXISTS "${sdkconfig_cmake}")
-    idf_die("sdkconfig.cmake file not found.")
-endif()
-include("${sdkconfig_cmake}")
-
-# Initialize the target architecture based on the configuration. Ensure this is
-# done after including the sdkconfig.
-__init_idf_target_arch()
-
-#[[ TODO
-
-Many of the following things are already implemented in PoC !38337, but they
-need to be reviewed.
-
-* Enable ccache if requested and available.
-
-There may be additional steps. We should initialize everything necessary before
-calling the ``project()`` function, as well as any global settings that cannot be
-modified later.
+At this point, the build system infrastructure is ready.
+Project-specific operations (component discovery, Kconfig generation,
+component manager, etc.) are handled in idf_project_init() after the
+project() call.
 
 #]]
diff --git a/tools/cmakev2/project.cmake b/tools/cmakev2/project.cmake
index cb0f2369ccb..480e2b520ac 100644
--- a/tools/cmakev2/project.cmake
+++ b/tools/cmakev2/project.cmake
@@ -581,6 +581,26 @@ macro(idf_project_init)
         # Create global flash targets.
         __create_project_flash_targets()
 
+        # Discover and initialize components
+        __init_components()
+
+        # Generate initial sdkconfig with discovered components
+        __generate_sdkconfig()
+
+        # Initialize the component manager and fetch components in a loop
+        __fetch_components_from_registry()
+
+        # Include sdkconfig.cmake
+        idf_build_get_property(sdkconfig_cmake __SDKCONFIG_CMAKE)
+        if(NOT EXISTS "${sdkconfig_cmake}")
+            idf_die("sdkconfig.cmake file not found.")
+        endif()
+        include("${sdkconfig_cmake}")
+
+        # Initialize the target architecture based on the configuration
+        # Ensure this is done after including the sdkconfig.
+        __init_idf_target_arch()
+
         # Include all project_include.cmake files for the components that have
         # been discovered.
         idf_build_get_property(component_names COMPONENTS_DISCOVERED)