Merge branch 'fix/cmakev2_fixes' into 'master'

fix(cmakev2): sync with cmakev1 changes

See merge request espressif/esp-idf!43095

Author: dobairoland

Kconfig

@@ -729,7 +729,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
     endmenu
 
-    menu "Configuration for components not included in the build"
+    menu "Project configuration for components not included in the build"
         depends on "${IDF_BUILD_V2}"
         osource "$COMPONENT_KCONFIGS_PROJBUILD_EXCLUDED_SOURCE_FILE"
     endmenu

tools/cmakev2/compat.cmake

@@ -258,10 +258,11 @@ function(__init_common_components)
     # Define common components that are included as dependencies for each
     # component.
     if("${idf_target}" STREQUAL "linux")
-        set(requires_common freertos esp_hw_support heap log soc hal esp_rom esp_common esp_system linux)
+        set(requires_common freertos esp_hw_support heap log soc hal esp_rom esp_common esp_system linux
+                            esp_stdio)
     else()
         set(requires_common cxx esp_libc freertos esp_hw_support heap log soc hal esp_rom esp_common
-                            esp_system ${idf_target_arch})
+                            esp_system esp_stdio ${idf_target_arch})
     endif()
     idf_build_set_property(__COMPONENT_REQUIRES_COMMON "${requires_common}")
 

tools/cmakev2/project.cmake

@@ -128,7 +128,7 @@ function(__init_project_configuration)
     if(IDF_TARGET STREQUAL "linux")
         # Building for Linux target, fall back to an older version of the standard
         # if the preferred one is not supported by the compiler.
-        set(preferred_c_versions gnu17 gnu11 gnu99)
+        set(preferred_c_versions gnu23 gnu17 gnu11 gnu99)
         set(ver_found FALSE)
         foreach(c_version ${preferred_c_versions})
             check_c_compiler_flag("-std=${c_version}" ver_${c_version}_supported)
@@ -143,7 +143,7 @@ function(__init_project_configuration)
                     "${preferred_c_versions}. Please upgrade the host compiler.")
         endif()
 
-        set(preferred_cxx_versions gnu++2b gnu++20 gnu++2a gnu++17 gnu++14)
+        set(preferred_cxx_versions gnu++26 gnu++2b gnu++20 gnu++2a gnu++17 gnu++14)
         set(ver_found FALSE)
         foreach(cxx_version ${preferred_cxx_versions})
             check_cxx_compiler_flag("-std=${cxx_version}" ver_${cxx_version}_supported)
@@ -167,8 +167,8 @@ function(__init_project_configuration)
         # function, which must be called after project().
         # Please update docs/en/api-guides/c.rst, docs/en/api-guides/cplusplus.rst and
         # tools/test_apps/system/cxx_build_test/main/test_cxx_standard.cpp when changing this.
-        list(APPEND c_compile_options   "-std=gnu17")
-        list(APPEND cxx_compile_options "-std=gnu++2b")
+        list(APPEND c_compile_options   "-std=gnu23")
+        list(APPEND cxx_compile_options "-std=gnu++26")
     endif()
 
     if(CONFIG_COMPILER_OPTIMIZATION_SIZE)
@@ -472,13 +472,10 @@ function(__init_project_configuration)
         get_filename_component(compiler_sysroot "${compiler_sysroot}/.." REALPATH)
         list(APPEND compile_options "-fdebug-prefix-map=${compiler_sysroot}=/TOOLCHAIN")
         string(APPEND gdbinit_file_lines "set substitute-path /TOOLCHAIN ${compiler_sysroot}\n")
-
-        file(WRITE "${build_dir}/prefix_map_gdbinit" "${gdbinit_file_lines}")  # TODO IDF-11667
-        idf_build_set_property(DEBUG_PREFIX_MAP_GDBINIT "${gdbinit_path}")
     else()
         set(gdbinit_file_lines "# There is no prefix map defined for the project.\n")
     endif()
-    # Write prefix_map_gdbinit file even it is empty.
+    # Write the prefix_map file even if it is empty.
     file(MAKE_DIRECTORY ${gdbinit_dir})
     file(WRITE "${gdbinit_path}" "${gdbinit_file_lines}")
 
@@ -571,6 +568,10 @@ macro(idf_project_init)
         # Ensure this function is executed only once throughout the entire
         # project.
 
+        # Warn about the use of deprecated variables.
+        deprecate_variable(COMPONENTS)
+        deprecate_variable(EXCLUDE_COMPONENTS)
+
         # Set PROJECT_NAME build property
         __init_project_name()
 

tools/cmakev2/utilities.cmake

@@ -109,6 +109,40 @@ function(idf_dbg)
     message(DEBUG " IDF: ${joined}")
 endfunction()
 
+#[[
+    idf_deprecated(<msg>...)
+
+    *msg[in]*
+
+        Message to print.
+
+    Print deprecated ``<msg>``. Multiple messages are concatenated into a
+    single message with no separator between them.
+#]]
+function(idf_deprecated)
+    set(joined "")
+    math(EXPR last "${ARGC} - 1")
+    foreach(i RANGE 0 ${last})
+        string(APPEND joined "${ARGV${i}}")
+    endforeach()
+    message(DEPRECATION " IDF: ${joined}")
+endfunction()
+
+#[[
+    deprecate_variable(<var>)
+
+    *var[in]*
+
+        Deprecated variable name.
+
+    Print a warning about the use of a deprecated variable.
+#]]
+function(deprecate_variable var)
+    if(${var})
+        idf_deprecated("The use of the '${var}' variable is deprecated and will be ignored.")
+    endif()
+endfunction()
+
 #[[
     __get_real_target(TARGET <target>
                       OUTPUT <variable>)