diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-06 17:28:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-06 17:28:14 (GMT) |
| commit | ffff5c17a5b87984b9bcb7e6f20445b0efdcd124 (patch) | |
| tree | d5ad03bd30a18cc0d13ad79350ef5059caab2726 | |
| parent | dcf9729eb9a3647fc3c9cd5f2e04a5419420fb61 (diff) | |
| parent | 0c3a04777cc5fa8bc43b57b789e72630781ef56a (diff) | |
| download | CMake-ffff5c17a5b87984b9bcb7e6f20445b0efdcd124.zip CMake-ffff5c17a5b87984b9bcb7e6f20445b0efdcd124.tar.gz CMake-ffff5c17a5b87984b9bcb7e6f20445b0efdcd124.tar.bz2 | |
Merge branch 'android-ndk-r13' into release
| -rw-r--r-- | Modules/Platform/Android/ndk-stl-c++.cmake | 8 | ||||
| -rw-r--r-- | Tests/RunCMake/Android/common.cmake | 4 |
2 files changed, 9 insertions, 3 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) diff --git a/Tests/RunCMake/Android/common.cmake b/Tests/RunCMake/Android/common.cmake index 7eac5d6..6ea0909 100644 --- a/Tests/RunCMake/Android/common.cmake +++ b/Tests/RunCMake/Android/common.cmake @@ -17,8 +17,8 @@ foreach(f endif() endforeach() -string(APPEND CMAKE_C_FLAGS " -Werror") -string(APPEND CMAKE_CXX_FLAGS " -Werror") +string(APPEND CMAKE_C_FLAGS " -Werror -Wno-attributes") +string(APPEND CMAKE_CXX_FLAGS " -Werror -Wno-attributes") string(APPEND CMAKE_EXE_LINKER_FLAGS " -Wl,-no-undefined") if(CMAKE_ANDROID_NDK) |