summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake/loop-darwin.cmake4
-rw-r--r--vendor/optional.cmake10
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
+)