diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-21 12:43:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-21 12:43:25 (GMT) |
| commit | 914874fdd1fecf8a5227e50ecf32c4322183f26f (patch) | |
| tree | 2aa1e0a58f1db8b1b036bcd65661104add9688bb | |
| parent | 876da11858ab6649bb088c4bb7758fc84910ba20 (diff) | |
| parent | 43f4326ece5035a5a028a7bb90a67c193804c997 (diff) | |
| download | CMake-914874fdd1fecf8a5227e50ecf32c4322183f26f.zip CMake-914874fdd1fecf8a5227e50ecf32c4322183f26f.tar.gz CMake-914874fdd1fecf8a5227e50ecf32c4322183f26f.tar.bz2 | |
Merge branch 'android-armeabi-c++_static' into release
| -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 |