summaryrefslogtreecommitdiff
path: root/vendor/optional.cmake
diff options
context:
space:
mode:
authorJulian Rex <julian.rex@gmail.com>2019-03-27 09:58:41 -0400
committerGitHub <noreply@github.com>2019-03-27 09:58:41 -0400
commitc7d53676d0dcbc72d71d921e385c656087b788a5 (patch)
treed785dccc56729a28d602cb613bd69e4388906364 /vendor/optional.cmake
parentf07a24dd3d2b67d2b3525f9c65f6152048454640 (diff)
downloadqtlocation-mapboxgl-c7d53676d0dcbc72d71d921e385c656087b788a5.tar.gz
[ios, core] Updates project for iOS SDK 12.2 / Always use vendored optional (#14241)
Diffstat (limited to 'vendor/optional.cmake')
-rw-r--r--vendor/optional.cmake10
1 files changed, 3 insertions, 7 deletions
diff --git a/vendor/optional.cmake b/vendor/optional.cmake
index fa299da6a6..ed7bfe8a38 100644
--- a/vendor/optional.cmake
+++ b/vendor/optional.cmake
@@ -1,9 +1,5 @@
add_library(optional INTERFACE)
-# 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
- )
-endif()
+target_include_directories(optional SYSTEM INTERFACE
+ ${CMAKE_SOURCE_DIR}/vendor/optional/include
+)