Commit 0dac6c13 authored by Yong Cong Sin's avatar Yong Cong Sin Committed by Henrik Brix Andersen
Browse files

build: namespace `autoconf.h` with `zephyr/`



Namespace the generated `autoconf.h` file with `zephyr/`.

Signed-off-by: default avatarYong Cong Sin <ycsin@meta.com>
parent 2d912d52
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@
#   CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS.
#
#3. The amendment function appends the defines from
#   ${CMAKE_BINARY_DIR}/zephyr/include/generated/autoconf.h to
#   ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/autoconf.h to
#   CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS.
#
function(eclipse_cdt4_generator_amendment _param_defs)
+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ include(python)
# <build>/zephyr/include/generated/autoconf.h.
# A project may request a custom location by setting AUTOCONF_H explicitly before
# calling 'find_package(Zephyr)' or loading this module.
set_ifndef(AUTOCONF_H ${PROJECT_BINARY_DIR}/include/generated/autoconf.h)
set_ifndef(AUTOCONF_H ${PROJECT_BINARY_DIR}/include/generated/zephyr/autoconf.h)
# Re-configure (Re-execute all CMakeLists.txt code) when autoconf.h changes
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${AUTOCONF_H})

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ Build System

     * - Affected header files
     * - ``app_version.h``
     * - ``autoconf.h``
     * - ``cmake_intdef.h``
     * - ``core-isa-dM.h``
     * - ``devicetree_generated.h``
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@

#include <zephyr/shell/shell.h>
#include <lvgl.h>
#include <autoconf.h>
#include <zephyr/autoconf.h>

#ifdef CONFIG_LV_Z_MEM_POOL_SYS_HEAP
#include "lvgl_mem.h"
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
#ifndef __RTE_DEVICE_H
#define __RTE_DEVICE_H

#include <autoconf.h>
#include <zephyr/autoconf.h>

/* ARRAY_SIZE causes a conflict as it is defined both by TF-M and indirectly by devicetree.h */
#undef ARRAY_SIZE
Loading