mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 06:47:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'android-armeabi-c++_static'

Browse Source 
43f4326e Android: Fix support for armeabi with c++_static
This commit is contained in:
Brad King
2016-10-21 08:59:07 -04:00
committed by CMake Topic Stage
parent ac394fddab 43f4326ece
commit 97670dbf2f
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Platform/Android/ndk-stl-c++_static.cmake
+2
View File
@@ -3,4 +3,6 @@ macro(__android_stl lang)
__android_stl_cxx(${lang} libc++_static.a)
__android_stl_lib(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/libc++abi.a" 0)
__android_stl_lib(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/libandroid_support.a" 0)
__android_stl_lib(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/libunwind.a" 0)
string(APPEND CMAKE_${lang}_STANDARD_LIBRARIES " -latomic") # provided by toolchain
endmacro()