diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-26 10:10:03 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-26 10:10:03 +0100 |
| commit | 3f0a0d1ffcb74c71fee3a1be77d09f1e4e44a453 (patch) | |
| tree | 740362cdb9f104f6531036da1d3f8059c71ee9c7 | |
| parent | c397fd853c8f5743385cc28596d0c7d261d2d1b6 (diff) | |
| download | qtlocation-mapboxgl-upstream/optional.tar.gz | |
[build] always use vendored optionalupstream/optional
| -rw-r--r-- | cmake/loop-darwin.cmake | 4 | ||||
| -rw-r--r-- | vendor/optional.cmake | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cmake/loop-darwin.cmake b/cmake/loop-darwin.cmake index a330375653..46d8f9edc0 100644 --- a/cmake/loop-darwin.cmake +++ b/cmake/loop-darwin.cmake @@ -7,6 +7,10 @@ target_include_directories(mbgl-loop-darwin PRIVATE src ) +target_link_libraries(mbgl-loop-darwin PUBLIC + optional +) + create_source_groups(mbgl-loop-darwin) set_target_properties(mbgl-loop-darwin PROPERTIES FOLDER "Core") 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 +) |