diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-12 12:39:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-07-12 12:39:55 (GMT) |
| commit | e8e38aea260a2dec1e5d95e42a09c21149fab9c9 (patch) | |
| tree | c4d391c7c282bed58b0a8f48c3e06521749cf2ae | |
| parent | c42c039d324b4c56a9c550d158b6e085259c87aa (diff) | |
| parent | e0fb3f314f0dcd2aa0ad2fd97fe3637f18747439 (diff) | |
| download | CMake-e8e38aea260a2dec1e5d95e42a09c21149fab9c9.zip CMake-e8e38aea260a2dec1e5d95e42a09c21149fab9c9.tar.gz CMake-e8e38aea260a2dec1e5d95e42a09c21149fab9c9.tar.bz2 | |
Merge branch 'android-fix-c++_shared' into release-3.9
| -rw-r--r-- | Modules/Platform/Android/ndk-stl-c++_shared.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/Platform/Android/ndk-stl-c++_shared.cmake b/Modules/Platform/Android/ndk-stl-c++_shared.cmake index f585adb..3389408 100644 --- a/Modules/Platform/Android/ndk-stl-c++_shared.cmake +++ b/Modules/Platform/Android/ndk-stl-c++_shared.cmake @@ -1,4 +1,5 @@ include(Platform/Android/ndk-stl-c++) macro(__android_stl lang) __android_stl_cxx(${lang} libc++_shared.so) + __android_stl_lib(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/libandroid_support.a" 0) endmacro() |