Commit 9b30667c authored by Fabio Baltieri's avatar Fabio Baltieri Committed by Carles Cufi
Browse files

build: drop LEGACY_INCLUDE_PATH support 



LEGACY_INCLUDE_PATH has been defaulting to "n" and marked as deprecated
in both v3.2 and v3.3. Drop the option entirely for v3.4.

Signed-off-by: default avatarFabio Baltieri <fabiobaltieri@google.com>
parent f874ba27

CMakeLists.txt

+0 −4
Original line number Diff line number Diff line
@@ -104,10 +104,6 @@ add_library(zephyr_interface INTERFACE) 
# flags that come with zephyr_interface.

zephyr_library_named(zephyr)



if(CONFIG_LEGACY_INCLUDE_PATH)

  zephyr_include_directories(include/zephyr)

endif()



zephyr_include_directories(

  include

  ${PROJECT_BINARY_DIR}/include/generated

Kconfig.zephyr

+0 −11
Original line number Diff line number Diff line
@@ -932,14 +932,3 @@ config COMPAT_INCLUDES 
	  deprecated header files.



endmenu
 


config LEGACY_INCLUDE_PATH

	bool "Allow for the legacy include paths (without the zephyr/ prefix) (DEPRECATED)"

	select DEPRECATED

	help

	  DEPRECATED: Allow applications and libraries to use the Zephyr legacy

	  include path which does not use the zephyr/ prefix. For example, the

	  preferred way to include a Zephyr header is to use <zephyr/kernel.h>,

	  but enabling CONFIG_LEGACY_INCLUDE_PATH will allow developers to use

	  <kernel.h> instead. This (without the zephyr/ prefix) is deprecated

	  and should be avoided. Eventually, it will not be supported.

boards/x86/ehl_crb/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands 
  -c ${CMAKE_C_COMPILER}

  -o ${CMAKE_OBJCOPY}

  -i ${ZEPHYR_BASE}/include

     $<$<BOOL:${CONFIG_LEGACY_INCLUDE_PATH}>:${ZEPHYR_BASE}/include/zephyr>

  -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf

  $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>

  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}

boards/x86/qemu_x86/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands 
  COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/arch/x86/zefi/zefi.py

  -c ${CMAKE_C_COMPILER}

  -i ${ZEPHYR_BASE}/include

     $<$<BOOL:${CONFIG_LEGACY_INCLUDE_PATH}>:${ZEPHYR_BASE}/include/zephyr>

  -o ${CMAKE_OBJCOPY}

  -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf

  $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>

boards/x86/rpl_crb/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands 
  -c ${CMAKE_C_COMPILER}

  -o ${CMAKE_OBJCOPY}

  -i ${ZEPHYR_BASE}/include

     $<$<BOOL:${CONFIG_LEGACY_INCLUDE_PATH}>:${ZEPHYR_BASE}/include/zephyr>

  -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf

  $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>

  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}

CRA Git | Maintained and supported by SUSTech CRA and CCSE