diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-28 13:44:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-08-28 13:44:03 (GMT) |
| commit | 0e764082fe5f9d9c0e33244412f0d4a519e4a2e6 (patch) | |
| tree | 2b506a068cbd50ce02744f424f08b418c4458b41 /Help | |
| parent | fef24e72a9d389379ba0a60efe5cf12905e62c31 (diff) | |
| parent | ca97d4cb5f5872fb63b36a09fff6ee865bbcbb23 (diff) | |
| download | CMake-0e764082fe5f9d9c0e33244412f0d4a519e4a2e6.zip CMake-0e764082fe5f9d9c0e33244412f0d4a519e4a2e6.tar.gz CMake-0e764082fe5f9d9c0e33244412f0d4a519e4a2e6.tar.bz2 | |
Merge branch 'android-ndk-r18' into release-3.12
Merge-request: !2319
Diffstat (limited to 'Help')
| -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. |