diff options
author | Haibo Huang <hhb@google.com> | 2020-12-01 20:34:59 -0800 |
---|---|---|
committer | Haibo Huang <hhb@google.com> | 2020-12-01 20:34:59 -0800 |
commit | d09ee7574f3e46668b23b3b6efebd0ea75de85b2 (patch) | |
tree | 6d4af5bfcafaa4c04522a625c4a5c1648b4b88ca /share/cmake-3.18/Help | |
parent | 39101902db4b5a188fe464a65a537498cf16c783 (diff) | |
download | darwin-x86-d09ee7574f3e46668b23b3b6efebd0ea75de85b2.tar.gz |
Update cmake prebuilts for Darwinndk-r24-beta2ndk-r24-beta1ndk-r23bndk-r23-beta6ndk-r23-beta5ndk-r23-beta4ndk-r23-beta3ndk-r23-beta2ndk-r23-beta1ndk-r23llvm-r416183busytown-mac1010-releaseandroidx-preference-release
Built at:
http://fusion/2022ebf8-e52f-4702-9a12-62fb029633bf
Contains cherry-picks from upstream:
https://android-review.git.corp.google.com/c/platform/external/cmake/+/1514904
Change-Id: Ie9708401a3e6ce77bda195f1dbd342f67eff8573
Diffstat (limited to 'share/cmake-3.18/Help')
-rw-r--r-- | share/cmake-3.18/Help/manual/cmake-variables.7.rst | 2 | ||||
-rw-r--r-- | share/cmake-3.18/Help/variable/CMAKE_ANDROID_EXCEPTIONS.rst | 7 | ||||
-rw-r--r-- | share/cmake-3.18/Help/variable/CMAKE_ANDROID_RTTI.rst | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/share/cmake-3.18/Help/manual/cmake-variables.7.rst b/share/cmake-3.18/Help/manual/cmake-variables.7.rst index 4ce8365..6480db1 100644 --- a/share/cmake-3.18/Help/manual/cmake-variables.7.rst +++ b/share/cmake-3.18/Help/manual/cmake-variables.7.rst @@ -332,6 +332,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 @@ -345,6 +346,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 diff --git a/share/cmake-3.18/Help/variable/CMAKE_ANDROID_EXCEPTIONS.rst b/share/cmake-3.18/Help/variable/CMAKE_ANDROID_EXCEPTIONS.rst new file mode 100644 index 0000000..6dd44f8 --- /dev/null +++ b/share/cmake-3.18/Help/variable/CMAKE_ANDROID_EXCEPTIONS.rst @@ -0,0 +1,7 @@ +CMAKE_ANDROID_EXCEPTIONS +------------------------ + +.. versionadded:: 3.20 + +When :ref:`Cross Compiling for Android with the NDK`, this variable may be set +to specify whether exceptions are enabled. diff --git a/share/cmake-3.18/Help/variable/CMAKE_ANDROID_RTTI.rst b/share/cmake-3.18/Help/variable/CMAKE_ANDROID_RTTI.rst new file mode 100644 index 0000000..0e98206 --- /dev/null +++ b/share/cmake-3.18/Help/variable/CMAKE_ANDROID_RTTI.rst @@ -0,0 +1,7 @@ +CMAKE_ANDROID_RTTI +------------------ + +.. versionadded:: 3.20 + +When :ref:`Cross Compiling for Android with the NDK`, this variable may be set +to specify whether RTTI is enabled. |