Commit fd4700d7 authored by Stephanos Ioannidis's avatar Stephanos Ioannidis Committed by Anas Nashif
Browse files

cmake: compiler: Add framework for disabling C++ standard includes 



This commit adds a new C++ compiler property `nostdincxx` which
specifies the C++ compiler flag for excluding the C++ standard library
include directory from the include paths.

Signed-off-by: default avatarStephanos Ioannidis <root@stephanos.io>
parent 80681d29

CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -1675,13 +1675,17 @@ if((CMAKE_BUILD_TYPE IN_LIST build_types) AND (NOT NO_BUILD_TYPE_WARNING)) 
  endif()

endif()



# @Intent: Set compiler specific flags for standard C includes

# @Intent: Set compiler specific flags for standard C/C++ includes

# Done at the very end, so any other system includes which may

# be added by Zephyr components were first in list.

# Note, the compile flags are moved, but the system include is still present here.

zephyr_compile_options($<TARGET_PROPERTY:compiler,nostdinc>)

target_include_directories(zephyr_interface SYSTEM INTERFACE $<TARGET_PROPERTY:compiler,nostdinc_include>)



if(NOT CONFIG_LIB_CPLUSPLUS)

  zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler-cpp,nostdincxx>>)

endif()



# Finally export all build flags from Zephyr

add_subdirectory_ifdef(

  CONFIG_MAKEFILE_EXPORTS

cmake/compiler/compiler_flags_template.cmake

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ set_compiler_property(PROPERTY cstd) 
set_compiler_property(PROPERTY nostdinc)

set_compiler_property(PROPERTY nostdinc_include)



# Compiler flags for disabling C++ standard include.

set_compiler_property(TARGET compiler-cpp PROPERTY nostdincxx)



# Required C++ flags when compiling C++ code

set_property(TARGET compiler-cpp PROPERTY required)

CRA Git | Maintained and supported by SUSTech CRA and CCSE