提交 d3501f15 编写于 作者: A Andrey Kamaev

Android toolchain: restored explicit include_directories of system /usr/include

It is needed because of explicit STL include paths.
Otherwise some standard headers (like fenv.h) can not not be correctly found by the compiler.
上级 dcdbc638
...@@ -1175,12 +1175,9 @@ if( DEFINED ANDROID_EXCEPTIONS AND ANDROID_STL_FORCE_FEATURES ) ...@@ -1175,12 +1175,9 @@ if( DEFINED ANDROID_EXCEPTIONS AND ANDROID_STL_FORCE_FEATURES )
endif() endif()
# global includes and link directories # global includes and link directories
if( ANDROID_STL_INCLUDE_DIRS ) include_directories( SYSTEM "${ANDROID_SYSROOT}/usr/include" ${ANDROID_STL_INCLUDE_DIRS} )
include_directories( SYSTEM ${ANDROID_STL_INCLUDE_DIRS} )
endif()
link_directories( "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" ) link_directories( "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" )
# set these global flags for cmake client scripts to change behavior # set these global flags for cmake client scripts to change behavior
set( ANDROID True ) set( ANDROID True )
set( BUILD_ANDROID True ) set( BUILD_ANDROID True )
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册