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

Merge topic 'android-system-stl'

Browse Source 
38b00f8801 Android: Fix linking android_support for pre-21 system STL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6799
This commit is contained in:
Brad King
2021-12-14 14:40:02 +00:00
committed by Kitware Robot
parent 25a300b76e 38b00f8801
commit 7f6cce63fc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Platform/Android-Common.cmake
View File

@@ -56,7 +56,7 @@ if(CMAKE_ANDROID_STL_TYPE)
if(_ANDROID_STL_EXCEPTIONS OR _ANDROID_STL_RTTI)
string(APPEND CMAKE_${lang}_STANDARD_LIBRARIES " -lc++abi")
if(CMAKE_SYSTEM_VERSION LESS 21)
list(APPEND CMAKE_${lang}_STANDARD_LIBRARIES "-landroid_support")
string(APPEND CMAKE_${lang}_STANDARD_LIBRARIES " -landroid_support")
endif()
endif()
endmacro()