diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-14 14:40:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-12-14 14:40:16 (GMT) |
| commit | 29442a46386c8c8afaec7069e733d43794bbf9dc (patch) | |
| tree | ed47e008d63d0462c3353fa161defe017f76dce8 /Modules | |
| parent | 6752fb2889ebbe23a9c82246a9b1089d7c788ca4 (diff) | |
| parent | 38b00f88014a0866e2aa650550977b4bc676b355 (diff) | |
| download | CMake-29442a46386c8c8afaec7069e733d43794bbf9dc.zip CMake-29442a46386c8c8afaec7069e733d43794bbf9dc.tar.gz CMake-29442a46386c8c8afaec7069e733d43794bbf9dc.tar.bz2 | |
Merge topic 'android-system-stl' into release-3.22
38b00f8801 Android: Fix linking android_support for pre-21 system STL
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6799
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Android-Common.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Android-Common.cmake b/Modules/Platform/Android-Common.cmake index 39da933..f1deaca 100644 --- a/Modules/Platform/Android-Common.cmake +++ b/Modules/Platform/Android-Common.cmake @@ -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() |