StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

CMake: Use toolchain info for system includes

Browse Source 
CMake already provides `CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES`, so there's
no need to invoke the compiler to determine system include directories.

For the Clang tool based header generator, adding the includes from the
current toolchain is strictly more correct than having it try and figure them
out itself (which will favor files from any installed libc++ and/or Clang).

PiperOrigin-RevId: 531207747
Change-Id: Icfcf7b495a0a5782c21a665984d9039d365db898
This commit is contained in:
Christian Blichmann 2023-05-11 08:19:37 -07:00 committed by Copybara-Service
parent a078043f8e
commit 9299156727
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/SapiBuildDefs.cmake
View File

@ -153,10 +153,13 @@ function(add_sapi_library)
"--sapi_ns=${_sapi_NAMESPACE}" "--sapi_ns=${_sapi_NAMESPACE}"
) )
if(SAPI_ENABLE_CLANG_TOOL) if(SAPI_ENABLE_CLANG_TOOL)
set(_sapi_isystem_args ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
list(TRANSFORM _sapi_isystem_args PREPEND --extra-arg-before=-isystem)
list(APPEND _sapi_generator_command list(APPEND _sapi_generator_command
sapi_generator_tool sapi_generator_tool
-p "${CMAKE_CURRENT_BINARY_DIR}" -p "${CMAKE_CURRENT_BINARY_DIR}"
${_sapi_generator_args} ${_sapi_generator_args}
${_sapi_isystem_args}
${_sapi_full_inputs} ${_sapi_full_inputs}
) )
add_custom_command( add_custom_command(
@ -179,9 +182,8 @@ function(add_sapi_library)
add_custom_command( add_custom_command(
OUTPUT "${_sapi_gen_header}" "${_sapi_isystem}" OUTPUT "${_sapi_gen_header}" "${_sapi_isystem}"
COMMAND sh -c COMMAND sh -c
"${CMAKE_CXX_COMPILER} -E -x c++ -v /dev/null 2>&1 | \ "printf '${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' | \
awk '/> search starts here:/{f=1;next}/^End of search/{f=0}f{print $1}' \ sed \"s/;/\\n/g\" > \"${_sapi_isystem}\""
> \"${_sapi_isystem}\""
COMMAND ${_sapi_generator_command} COMMAND ${_sapi_generator_command}
COMMENT "Generating interface" COMMENT "Generating interface"
DEPENDS ${_sapi_INPUTS} DEPENDS ${_sapi_INPUTS}