kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android: Update libc++ include directories for NDK r13 

The Android NDK r13 moved the libc++ include directories.

Closes: #16346
This commit is contained in:
Brad King 2016-10-06 11:50:29 -04:00
parent ebef3632c7
commit 0c3a04777c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/Platform/Android/ndk-stl-c++.cmake
View File

@ -3,7 +3,13 @@ set(_ANDROID_STL_RTTI 1)
set(_ANDROID_STL_EXCEPTIONS 1) set(_ANDROID_STL_EXCEPTIONS 1)
macro(__android_stl_cxx lang filename) macro(__android_stl_cxx lang filename)
# Add the include directory. # Add the include directory.
if(EXISTS "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef")
# r12 and below
__android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include" 1) __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include" 1)
else()
# r13 and above
__android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/include" 1)
endif()
# Add a secondary include directory if it exists. # Add a secondary include directory if it exists.
__android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/android/support/include" 0) __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/android/support/include" 0)