Added missing bits of docs for Android flags (conan-io#1301)

Dattax · May 31, 2019 · a40334f · a40334f
1 parent ee0808d
commit a40334f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/reference/build_helpers/cmake.rst b/reference/build_helpers/cmake.rst
@@ -228,7 +228,6 @@ The CMake helper will automatically append some definitions based on your settin
 | ANDROID_NDK                               | Defined when one of ANDROID_NDK_ROOT or ANDROID_NDK_HOME environment variables presented                                     |
 +-------------------------------------------+------------------------------------------------------------------------------------------------------------------------------+
 
-
 There are some definitions set to be used later on the the ``install()`` step too:
 
 +-----------------------------+---------------------------------------------+

diff --git a/reference/config_files/settings.yml.rst b/reference/config_files/settings.yml.rst
@@ -76,7 +76,7 @@ are possible. These are the **default** values, but it is possible to customize
             version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0",
                       "5.0", "6.0", "7.0",
                       "8"]
-            libcxx: [libstdc++, libstdc++11, libc++]
+            libcxx: [libstdc++, libstdc++11, libc++, c++_shared, c++_static]
             cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
         apple-clang:
             version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1", "10.0"]

diff --git a/reference/env_vars.rst b/reference/env_vars.rst
@@ -37,6 +37,8 @@ the :ref:`CMake build tool<cmake_reference>`:
 +-----------------------------------------+------------------------------------------------------------------------------------------------+
 | CONAN_CMAKE_GENERATOR_PLATFORM          | CMAKE_GENERATOR_PLATFORM                                                                       |
 +-----------------------------------------+------------------------------------------------------------------------------------------------+
+| CONAN_CMAKE_ANDROID_NDK                 | CMAKE_ANDROID_NDK                                                                              |
++-----------------------------------------+------------------------------------------------------------------------------------------------+
 
 .. seealso::
-Original file line number
+Diff line change
@@ Expand Up @@
     | ANDROID_NDK                               | Defined when one of ANDROID_NDK_ROOT or ANDROID_NDK_HOME environment variables presented                                     |
     +-------------------------------------------+------------------------------------------------------------------------------------------------------------------------------+
     There are some definitions set to be used later on the the ``install()`` step too:
     +-----------------------------+---------------------------------------------+
@@ Expand Down @@