diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-07 14:16:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-07 14:16:28 (GMT) |
| commit | 111d90465f00559c808b7a02944f890af6c0fe89 (patch) | |
| tree | 3de2d02500fa34b20ef57c13f6ae20b9b65e8adc | |
| parent | d231f3b738b31ebad075c49abcef972c268ba9d0 (diff) | |
| parent | 8cdac469d19f486b167006e4d4fcbf2a18c85866 (diff) | |
| download | CMake-111d90465f00559c808b7a02944f890af6c0fe89.zip CMake-111d90465f00559c808b7a02944f890af6c0fe89.tar.gz CMake-111d90465f00559c808b7a02944f890af6c0fe89.tar.bz2 | |
Merge branch 'android-cxxabi' into release
| -rw-r--r-- | Modules/Platform/Android/ndk-stl-c++.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Android/android.cxx | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/Android/common.cmake | 2 |
3 files changed, 7 insertions, 0 deletions
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}") |