diff options
Diffstat (limited to 'platform/macos/config.cmake')
| -rw-r--r-- | platform/macos/config.cmake | 43 |
1 files changed, 35 insertions, 8 deletions
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index 27bf555ec6..2e4b7a01b2 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -1,9 +1,10 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10) mason_use(glfw VERSION 3.2.1) -mason_use(boost_libprogram_options VERSION 1.60.0) +mason_use(boost_libprogram_options VERSION 1.62.0) mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX}) mason_use(benchmark VERSION 1.0.0) +mason_use(icu VERSION 58.1) include(cmake/loop-darwin.cmake) @@ -16,6 +17,10 @@ macro(mbgl_platform_core) PRIVATE platform/default/local_file_source.cpp PRIVATE platform/default/online_file_source.cpp + # Default styles + PRIVATE platform/default/mbgl/util/default_styles.hpp + PRIVATE platform/default/mbgl/util/default_styles.cpp + # Offline PRIVATE platform/default/mbgl/storage/offline.cpp PRIVATE platform/default/mbgl/storage/offline_database.cpp @@ -26,32 +31,41 @@ macro(mbgl_platform_core) PRIVATE platform/default/sqlite3.hpp # Misc - PRIVATE platform/darwin/src/log_nslog.mm + PRIVATE platform/darwin/mbgl/storage/reachability.h + PRIVATE platform/darwin/mbgl/storage/reachability.m + PRIVATE platform/darwin/src/logging_nslog.mm PRIVATE platform/darwin/src/nsthread.mm - PRIVATE platform/darwin/src/reachability.m PRIVATE platform/darwin/src/string_nsstring.mm + PRIVATE platform/default/bidi.cpp # Image handling PRIVATE platform/darwin/src/image.mm # Headless view + PRIVATE platform/default/mbgl/gl/headless_backend.cpp + PRIVATE platform/default/mbgl/gl/headless_backend.hpp PRIVATE platform/darwin/src/headless_backend_cgl.cpp - PRIVATE platform/default/headless_backend.cpp - PRIVATE platform/default/headless_display.cpp - PRIVATE platform/default/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/headless_display.hpp + PRIVATE platform/darwin/src/headless_display_cgl.cpp + PRIVATE platform/default/mbgl/gl/offscreen_view.cpp + PRIVATE platform/default/mbgl/gl/offscreen_view.hpp # Thread pool - PRIVATE platform/default/thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp ) target_add_mason_package(mbgl-core PUBLIC geojson) + target_add_mason_package(mbgl-core PUBLIC icu) target_compile_options(mbgl-core PRIVATE -fobjc-arc + PRIVATE -fvisibility=hidden ) target_include_directories(mbgl-core - PRIVATE platform/default + PUBLIC platform/darwin + PUBLIC platform/default ) target_link_libraries(mbgl-core @@ -106,6 +120,10 @@ macro(mbgl_platform_test) COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}" ) + target_compile_options(mbgl-test + PRIVATE -fvisibility=hidden + ) + target_link_libraries(mbgl-test PRIVATE mbgl-loop PRIVATE "-framework Foundation" @@ -118,6 +136,10 @@ macro(mbgl_platform_test) endmacro() macro(mbgl_platform_benchmark) + target_compile_options(mbgl-benchmark + PRIVATE -fvisibility=hidden + ) + target_sources(mbgl-benchmark PRIVATE benchmark/src/main.cpp ) @@ -140,8 +162,13 @@ macro(mbgl_platform_benchmark) endmacro() macro(mbgl_platform_node) + target_compile_options(mbgl-node + PRIVATE -fvisibility=hidden + ) + target_link_libraries(mbgl-node PRIVATE "-framework Foundation" PRIVATE "-framework OpenGL" + PRIVATE "-Wl,-bind_at_load" ) endmacro() |