diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-07 13:34:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-07 13:53:51 (GMT) |
| commit | 8cdac469d19f486b167006e4d4fcbf2a18c85866 (patch) | |
| tree | 0bbaa4b4c8d8a95ba5118802828fe4d7a0b71b50 /Modules/Platform/Android | |
| parent | 0c3a04777cc5fa8bc43b57b789e72630781ef56a (diff) | |
| download | CMake-8cdac469d19f486b167006e4d4fcbf2a18c85866.zip CMake-8cdac469d19f486b167006e4d4fcbf2a18c85866.tar.gz CMake-8cdac469d19f486b167006e4d4fcbf2a18c85866.tar.bz2 | |
Android: Fix support for cxxabi.h with libc++
Additional include directories are needed for this on some STL types.
Closes: #16350
Diffstat (limited to 'Modules/Platform/Android')
| -rw-r--r-- | Modules/Platform/Android/ndk-stl-c++.cmake | 2 |
1 files changed, 2 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. |