diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-07 13:10:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-07 13:10:49 (GMT) |
| commit | 9e7f9bbf56b5d9201da0cc5b360555101c6c6a36 (patch) | |
| tree | c6dde7fc03ca9bd0c90cf67ba0eceba93bffbec9 /Modules | |
| parent | fadb812a52bbf14c7b4850e6a5fdd81405d8b5f5 (diff) | |
| parent | 0c3a04777cc5fa8bc43b57b789e72630781ef56a (diff) | |
| download | CMake-9e7f9bbf56b5d9201da0cc5b360555101c6c6a36.zip CMake-9e7f9bbf56b5d9201da0cc5b360555101c6c6a36.tar.gz CMake-9e7f9bbf56b5d9201da0cc5b360555101c6c6a36.tar.bz2 | |
Merge topic 'android-ndk-r13'
0c3a0477 Android: Update libc++ include directories for NDK r13
ebef3632 Android: Suppress -Wattributes warnings in test case builds
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Android/ndk-stl-c++.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Modules/Platform/Android/ndk-stl-c++.cmake b/Modules/Platform/Android/ndk-stl-c++.cmake index 14748a1..cb9fd68 100644 --- a/Modules/Platform/Android/ndk-stl-c++.cmake +++ b/Modules/Platform/Android/ndk-stl-c++.cmake @@ -3,7 +3,13 @@ set(_ANDROID_STL_RTTI 1) set(_ANDROID_STL_EXCEPTIONS 1) macro(__android_stl_cxx lang filename) # Add the include directory. - __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include" 1) + 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) + 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. __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/android/support/include" 0) |