diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-27 19:28:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-08-28 13:27:26 (GMT) |
| commit | ca97d4cb5f5872fb63b36a09fff6ee865bbcbb23 (patch) | |
| tree | 60fd4e6d8ad633e947da57155f2f1f9dc5175e8a /Help/variable | |
| parent | c4ab098097f4fe1bc85ee29c6de390dff435f63f (diff) | |
| download | CMake-ca97d4cb5f5872fb63b36a09fff6ee865bbcbb23.zip CMake-ca97d4cb5f5872fb63b36a09fff6ee865bbcbb23.tar.gz CMake-ca97d4cb5f5872fb63b36a09fff6ee865bbcbb23.tar.bz2 | |
Android: Add support for NDK r18
NDK r18 drops GCC toolchains and some STL types. We need to choose a
clang toolchain by default when no gcc toolchains are available. Switch
the STL type default to `c++_static` when the old `gnustl_static`
default is not available.
Update the test suite to not run tests for STL types that do not exist.
Also do not expect the gcc toolchain `cpp` tool to be available because
r18 does not provide it. Also teach it to tolerate `gcc -dumpmachine`
output like `arm--linux-android` that differs from the toolchain prefix.
Fixes: #18301
Diffstat (limited to 'Help/variable')
| -rw-r--r-- | Help/variable/CMAKE_ANDROID_STL_TYPE.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Help/variable/CMAKE_ANDROID_STL_TYPE.rst b/Help/variable/CMAKE_ANDROID_STL_TYPE.rst index cfb76aa..d174575 100644 --- a/Help/variable/CMAKE_ANDROID_STL_TYPE.rst +++ b/Help/variable/CMAKE_ANDROID_STL_TYPE.rst @@ -30,7 +30,8 @@ set to specify the STL variant to be used. The value may be one of: ``stlport_shared`` STLport Shared -The default value is ``gnustl_static``. Note that this default differs from +The default value is ``gnustl_static`` on NDK versions that provide it +and otherwise ``c++_static``. Note that this default differs from the native NDK build system because CMake may be used to build projects for Android that are not natively implemented for it and use the C++ standard library. |