diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-10-08 16:09:35 +0300 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-01-21 17:00:31 +0100 |
| commit | d53c7860cd663904e7ef529dfe527b16fd514f56 (patch) | |
| tree | e3e06015abc044fad57fe2722e1d87778089840a /vendor | |
| parent | d0e7326e5d42dbed0792c535fd4f25b920b057f0 (diff) | |
| download | qtlocation-mapboxgl-d53c7860cd663904e7ef529dfe527b16fd514f56.tar.gz | |
[build] use optional polyfill on Android, and upgrade to NDK r19
<experimental/optional> is not available anymore in newer STL versions, e.g. according to libc++'s TS deprecation policy: https://libcxx.llvm.org/TS_deprecation.html
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/optional.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vendor/optional.cmake b/vendor/optional.cmake index 157ccc991d..fa299da6a6 100644 --- a/vendor/optional.cmake +++ b/vendor/optional.cmake @@ -1,9 +1,8 @@ add_library(optional INTERFACE) -# This polyfill is really only needed for -# Windows. We need to be careful to not leak -# it into any of our public interfaces. -if(WIN32) +# This polyfill is needed for Windows and Android since these standard libraries don't ship with +# usable versions of <experimental/optional> +if(WIN32 OR MBGL_PLATFORM STREQUAL "android") target_include_directories(optional SYSTEM INTERFACE ${CMAKE_SOURCE_DIR}/vendor/optional/include ) |