[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-213-g0076f00

[Brad King]

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  0076f00d2d174da03b50ad5b06fa820ee47264c6 (commit)
       via  8cdac469d19f486b167006e4d4fcbf2a18c85866 (commit)
      from  284bc42262d70e849e5ebab15cf930f220a41f7c (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=0076f00d2d174da03b50ad5b06fa820ee47264c6
commit 0076f00d2d174da03b50ad5b06fa820ee47264c6
Merge: 284bc42 8cdac46
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 7 10:13:33 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 7 10:13:33 2016 -0400

    Merge topic 'android-cxxabi' into next
    
    8cdac469 Android: Fix support for cxxabi.h with libc++


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8cdac469d19f486b167006e4d4fcbf2a18c85866
commit 8cdac469d19f486b167006e4d4fcbf2a18c85866
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 7 09:34:41 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 7 09:53:51 2016 -0400

    Android: Fix support for cxxabi.h with libc++
    
    Additional include directories are needed for this on some STL types.
    
    Closes: #16350

diff --git a/Modules/Platform/Android/ndk-stl-c++.cmake b/Modules/Platform/Android/ndk-stl-c++.cmake
index cb9fd68..b27015d 100644
--- a/Modules/Platform/Android/ndk-stl-c++.cmake
+++ b/Modules/Platform/Android/ndk-stl-c++.cmake
@@ -6,9 +6,11 @@ macro(__android_stl_cxx lang filename)
   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++abi/libcxxabi/include" 1)
   else()
     # r13 and above
     __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/include" 1)
+    __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++abi/include" 1)
   endif()
 
   # Add a secondary include directory if it exists.
diff --git a/Tests/RunCMake/Android/android.cxx b/Tests/RunCMake/Android/android.cxx
index e6a6cda..2dee8f9 100644
--- a/Tests/RunCMake/Android/android.cxx
+++ b/Tests/RunCMake/Android/android.cxx
@@ -6,6 +6,9 @@
 #ifndef STL_SYSTEM
 #include <exception>
 #include <typeinfo>
+#ifndef STL_STLPORT
+#include <cxxabi.h>
+#endif
 #ifndef STL_GABI
 #include <iostream>
 #include <string>
diff --git a/Tests/RunCMake/Android/common.cmake b/Tests/RunCMake/Android/common.cmake
index 6ea0909..d803c98 100644
--- a/Tests/RunCMake/Android/common.cmake
+++ b/Tests/RunCMake/Android/common.cmake
@@ -43,6 +43,8 @@ elseif(CMAKE_ANDROID_STL_TYPE STREQUAL "system")
   add_definitions(-DSTL_SYSTEM)
 elseif(CMAKE_ANDROID_STL_TYPE MATCHES [[^gabi\+\+]])
   add_definitions(-DSTL_GABI)
+elseif(CMAKE_ANDROID_STL_TYPE MATCHES [[^stlport]])
+  add_definitions(-DSTL_STLPORT)
 endif()
 
 string(REPLACE "-" "_" abi "${CMAKE_ANDROID_ARCH_ABI}")

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Android/ndk-stl-c++.cmake |    2 ++
 Tests/RunCMake/Android/android.cxx         |    3 +++
 Tests/RunCMake/Android/common.cmake        |    2 ++
 3 files changed, 7 insertions(+)


hooks/post-receive
-- 
CMake