Skip to content
This repository has been archived by the owner on May 17, 2021. It is now read-only.

Commit

Permalink
Docs: add links to cmake documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
ruslo committed Dec 7, 2016
1 parent 28a560d commit c5ad5eb
Showing 1 changed file with 23 additions and 19 deletions.
42 changes: 23 additions & 19 deletions docs/toolchains/android/old.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@ Migration to CMake 3.7.1+
Here is the table for migrating from toolchain based on `taka-no-me`_ project to
CMake 3.7.1+:

+---------------------------------+----------------------------------------+
| taka-no-me | CMake 3.7.1+ |
+=================================+========================================+
| ANDROID_NATIVE_API_LEVEL | `CMAKE_SYSTEM_VERSION`_ |
+---------------------------------+----------------------------------------+
| ANDROID_NDK | `CMAKE_ANDROID_NDK`_ |
+---------------------------------+----------------------------------------+
| ANDROID_NDK_ABI_NAME | `CMAKE_ANDROID_ARCH_ABI`_ |
+---------------------------------+----------------------------------------+
| ANDROID_ARCH_NAME | `CMAKE_ANDROID_ARCH`_ |
+---------------------------------+----------------------------------------+
| ANDROID_ABI | `CMAKE_ANDROID_ARCH_ABI`_ [1]_ |
+---------------------------------+----------------------------------------+
| ANDROID_TOOLCHAIN_MACHINE_NAME | CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE |
+---------------------------------+----------------------------------------+
| ANDROID_COMPILER_VERSION | CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION |
+---------------------------------+----------------------------------------+
| ANDROID_NDK_HOST_SYSTEM_NAME | CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG |
+---------------------------------+----------------------------------------+
+---------------------------------+-------------------------------------------+
| taka-no-me | CMake 3.7.1+ |
+=================================+===========================================+
| ANDROID_NATIVE_API_LEVEL | `CMAKE_SYSTEM_VERSION`_ |
+---------------------------------+-------------------------------------------+
| ANDROID_NDK | `CMAKE_ANDROID_NDK`_ |
+---------------------------------+-------------------------------------------+
| ANDROID_NDK_ABI_NAME | `CMAKE_ANDROID_ARCH_ABI`_ |
+---------------------------------+-------------------------------------------+
| ANDROID_ARCH_NAME | `CMAKE_ANDROID_ARCH`_ |
+---------------------------------+-------------------------------------------+
| ANDROID_ABI | `CMAKE_ANDROID_ARCH_ABI`_ [1]_ |
+---------------------------------+-------------------------------------------+
| ANDROID_TOOLCHAIN_MACHINE_NAME | `CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE`_ |
+---------------------------------+-------------------------------------------+
| ANDROID_COMPILER_VERSION | `CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION`_ |
+---------------------------------+-------------------------------------------+
| ANDROID_NDK_HOST_SYSTEM_NAME | `CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG`_ |
+---------------------------------+-------------------------------------------+

.. _taka-no-me: https://github.com/taka-no-me/android-cmake
.. _CMAKE_SYSTEM_VERSION: https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_VERSION.html
Expand All @@ -42,3 +42,7 @@ CMake 3.7.1+:
.. _CMAKE_ANDROID_ARM_MODE: https://cmake.org/cmake/help/latest/variable/CMAKE_ANDROID_ARM_MODE.html
.. _CMAKE_ANDROID_ARM_NEON: https://cmake.org/cmake/help/latest/variable/CMAKE_ANDROID_ARM_NEON.html

.. _CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE: https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.html
.. _CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION: https://cmake.org/cmake/help/latest/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.html
.. _CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG: https://cmake.org/cmake/help/latest/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.html

0 comments on commit c5ad5eb

Please sign in to comment.