diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-05 12:55:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-05 12:55:46 (GMT) |
| commit | a9e2b18bf38a1c1d427b40ff12cf9f5bc517650a (patch) | |
| tree | deb68cae886734bbe6b6879dcc510b88efd6ced7 /Help/manual | |
| parent | d720cd847e332f1fe700eb77ad597bfc5e9f0223 (diff) | |
| parent | 4dca07882944ec5c1d87edf1b7df9f3c7294e0d0 (diff) | |
| download | CMake-a9e2b18bf38a1c1d427b40ff12cf9f5bc517650a.zip CMake-a9e2b18bf38a1c1d427b40ff12cf9f5bc517650a.tar.gz CMake-a9e2b18bf38a1c1d427b40ff12cf9f5bc517650a.tar.bz2 | |
Merge topic 'android-stl'
4dca078829 Android: Link c++abi and android_support when necessary
738caa4d48 Android: Add options to control exceptions/rtti
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5444
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 230fd3d..f0c9d99 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -336,6 +336,7 @@ Variables that Control the Build /variable/CMAKE_ANDROID_ARM_MODE /variable/CMAKE_ANDROID_ARM_NEON /variable/CMAKE_ANDROID_ASSETS_DIRECTORIES + /variable/CMAKE_ANDROID_EXCEPTIONS /variable/CMAKE_ANDROID_GUI /variable/CMAKE_ANDROID_JAR_DEPENDENCIES /variable/CMAKE_ANDROID_JAR_DIRECTORIES @@ -349,6 +350,7 @@ Variables that Control the Build /variable/CMAKE_ANDROID_PROCESS_MAX /variable/CMAKE_ANDROID_PROGUARD /variable/CMAKE_ANDROID_PROGUARD_CONFIG_PATH + /variable/CMAKE_ANDROID_RTTI /variable/CMAKE_ANDROID_SECURE_PROPS_PATH /variable/CMAKE_ANDROID_SKIP_ANT_STEP /variable/CMAKE_ANDROID_STANDALONE_TOOLCHAIN |