summaryrefslogtreecommitdiffstats
path: root/Modules/Platform/Android-Common.cmake
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2020-10-30 03:22:32 (GMT)
committerBrad King <brad.king@kitware.com>2020-11-04 19:18:03 (GMT)
commit738caa4d488375a3b20921b366b86b6614bdc769 (patch)
tree177305e437286ad749a4c163cbee6f9333b29ecf /Modules/Platform/Android-Common.cmake
parent622ac065d2abeb53de3548b7e4f3d9b5980dfa8d (diff)
downloadCMake-738caa4d488375a3b20921b366b86b6614bdc769.zip
CMake-738caa4d488375a3b20921b366b86b6614bdc769.tar.gz
CMake-738caa4d488375a3b20921b366b86b6614bdc769.tar.bz2
Android: Add options to control exceptions/rtti
With the NDK's `android.toolchain.cmake`, the user can control whether exceptions/rtti is enabled using `ANDROID_CPP_FEATURES`: https://android.googlesource.com/platform/ndk/+/43b2de34ef9e3a70573fe51a9e069f985a4be5b9/build/cmake/android.toolchain.cmake#548 Add `CMAKE_ANDROID_RTTI` and `CMAKE_ANDROID_EXCEPTIONS` to support that.
Diffstat (limited to 'Modules/Platform/Android-Common.cmake')
-rw-r--r--Modules/Platform/Android-Common.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/Platform/Android-Common.cmake b/Modules/Platform/Android-Common.cmake
index 581fde4..bd41a9c 100644
--- a/Modules/Platform/Android-Common.cmake
+++ b/Modules/Platform/Android-Common.cmake
@@ -81,6 +81,12 @@ if(CMAKE_ANDROID_STL_TYPE)
"Android: STL '${CMAKE_ANDROID_STL_TYPE}' not supported by this NDK."
)
endif()
+ if(DEFINED CMAKE_ANDROID_RTTI)
+ set(_ANDROID_STL_RTTI ${CMAKE_ANDROID_RTTI})
+ endif()
+ if(DEFINED CMAKE_ANDROID_EXCEPTIONS)
+ set(_ANDROID_STL_EXCEPTIONS ${CMAKE_ANDROID_EXCEPTIONS})
+ endif()
elseif(CMAKE_ANDROID_NDK)
macro(__android_stl_inc lang dir req)