This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via bf023b1933deae89f90de611dca8cc6b249f2d8c (commit) via 0c3a04777cc5fa8bc43b57b789e72630781ef56a (commit) via ebef3632c79491c402991967aab03a9c971cb70d (commit) from 23d732fa83e7e0ae07aad810e1867238900a51f0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf023b1933deae89f90de611dca8cc6b249f2d8c commit bf023b1933deae89f90de611dca8cc6b249f2d8c Merge: 23d732f 0c3a047 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Oct 6 13:28:09 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Oct 6 13:28:09 2016 -0400 Merge topic 'android-ndk-r13' into next 0c3a0477 Android: Update libc++ include directories for NDK r13 ebef3632 Android: Suppress -Wattributes warnings in test case builds https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c3a04777cc5fa8bc43b57b789e72630781ef56a commit 0c3a04777cc5fa8bc43b57b789e72630781ef56a Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Oct 6 11:50:29 2016 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Oct 6 13:26:40 2016 -0400 Android: Update libc++ include directories for NDK r13 The Android NDK r13 moved the libc++ include directories. Closes: #16346 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) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebef3632c79491c402991967aab03a9c971cb70d commit ebef3632c79491c402991967aab03a9c971cb70d Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Oct 6 11:43:24 2016 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Oct 6 13:26:05 2016 -0400 Android: Suppress -Wattributes warnings in test case builds We use `-Werror` in the Android test builds to make sure there are no warnings that we care about (e.g. unused flags). However, the NDK r13 tools produce a warning about their own builtins: ``` <built-in>: In function 'float abs(float)': <built-in>: warning: conflicts with previous declaration here [-Wattributes] ``` Suppress this warning so that we can continue using `-Werror` but tolerate these warnings. 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) ----------------------------------------------------------------------- Summary of changes: Modules/Platform/Android/ndk-stl-c++.cmake | 8 +++++++- Tests/RunCMake/Android/common.cmake | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits