[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-642-ga93f28e

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a93f28e4c0794fdfc1226d774a8ddce57aeef452 (commit)
       via  43f4326ece5035a5a028a7bb90a67c193804c997 (commit)
      from  9f2c6ee4d0a389aa89f94754f50a59674ab06e67 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a93f28e4c0794fdfc1226d774a8ddce57aeef452
commit a93f28e4c0794fdfc1226d774a8ddce57aeef452
Merge: 9f2c6ee 43f4326
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 21 08:43:55 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 21 08:43:55 2016 -0400

    Merge topic 'android-armeabi-c++_static' into next
    
    43f4326e Android: Fix support for armeabi with c++_static


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43f4326ece5035a5a028a7bb90a67c193804c997
commit 43f4326ece5035a5a028a7bb90a67c193804c997
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 21 08:23:38 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 21 08:42:25 2016 -0400

    Android: Fix support for armeabi with c++_static
    
    Add missing "unwind" and "atomic" libraries needed for this combination.
    See `${ndk}/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++.a` for the
    libraries the NDK uses.
    
    Issue: #16380

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

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Android/ndk-stl-c++_static.cmake |    2 ++
 Tests/RunCMake/Android/RunCMakeTest.cmake         |    5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake