diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-12 13:00:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-12 13:00:43 (GMT) |
| commit | e63472abc597e87ea7e8ded6551cfe968db69095 (patch) | |
| tree | d879444c6e0aded60f90f7ce582ccbf077252ee3 /Modules/Platform | |
| parent | ff9321a18a94080e9b43800627cfcec02dad286f (diff) | |
| parent | e0fb3f314f0dcd2aa0ad2fd97fe3637f18747439 (diff) | |
| download | CMake-e63472abc597e87ea7e8ded6551cfe968db69095.zip CMake-e63472abc597e87ea7e8ded6551cfe968db69095.tar.gz CMake-e63472abc597e87ea7e8ded6551cfe968db69095.tar.bz2 | |
Merge topic 'android-fix-c++_shared'
e0fb3f31 Android: Link to android_support with c++_shared
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1048
Diffstat (limited to 'Modules/Platform')
| -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() |