mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 19:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Andrey Kamaev 2012-09-05 16:25:14 +04:00
parent dcdbc638af
commit d3501f1545
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/android.toolchain.cmake
View File

@ -1175,12 +1175,9 @@ if( DEFINED ANDROID_EXCEPTIONS AND ANDROID_STL_FORCE_FEATURES )
endif()
# global includes and link directories
if( ANDROID_STL_INCLUDE_DIRS )
include_directories( SYSTEM ${ANDROID_STL_INCLUDE_DIRS} )
endif()
include_directories( SYSTEM "${ANDROID_SYSROOT}/usr/include" ${ANDROID_STL_INCLUDE_DIRS} )
link_directories( "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" )
# set these global flags for cmake client scripts to change behavior
set( ANDROID True )
set( BUILD_ANDROID True )