diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-21 12:59:07 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-21 12:59:07 (GMT) |
| commit | 97670dbf2fa567998c26686caa4f03b6f4e78967 (patch) | |
| tree | 8ec155adb0e5e6950f636eba1e3f4579becea15c | |
| parent | ac394fddab4c4407c08059eb70f6f2363b3c45fc (diff) | |
| parent | 43f4326ece5035a5a028a7bb90a67c193804c997 (diff) | |
| download | CMake-97670dbf2fa567998c26686caa4f03b6f4e78967.zip CMake-97670dbf2fa567998c26686caa4f03b6f4e78967.tar.gz CMake-97670dbf2fa567998c26686caa4f03b6f4e78967.tar.bz2 | |
Merge topic 'android-armeabi-c++_static'
43f4326e Android: Fix support for armeabi with c++_static
| -rw-r--r-- | Modules/Platform/Android/ndk-stl-c++_static.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Android/RunCMakeTest.cmake | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Modules/Platform/Android/ndk-stl-c++_static.cmake b/Modules/Platform/Android/ndk-stl-c++_static.cmake index 8e562f8..061a5c2 100644 --- a/Modules/Platform/Android/ndk-stl-c++_static.cmake +++ b/Modules/Platform/Android/ndk-stl-c++_static.cmake @@ -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() diff --git a/Tests/RunCMake/Android/RunCMakeTest.cmake b/Tests/RunCMake/Android/RunCMakeTest.cmake index 39b77cd..86a9896 100644 --- a/Tests/RunCMake/Android/RunCMakeTest.cmake +++ b/Tests/RunCMake/Android/RunCMakeTest.cmake @@ -174,11 +174,6 @@ foreach(ndk IN LISTS TEST_ANDROID_NDK) continue() endif() - # Skip combinations that seem to be broken. - if("${stl};${abi}" MATCHES [[^c\+\+_static;armeabi]]) - continue() - endif() - # Run the tests for this combination. if("${abi}" STREQUAL "armeabi") run_Android(ndk-armeabi-thumb) # default: -DCMAKE_ANDROID_ARCH_ABI=armeabi -DCMAKE_ANDROID_ARM_MODE=0 |