2354c87411
* [ios] wip runtime styling * [ios, macos] Outlined header templates * [ios, macos] cleanup and use appropiate data types * [ios, macos] removed refs to mbgl and added convenient color methods on UIColor and NSColor * [ios, macos] updated header template, included doc string * [ios, macos] outlined template for layer implementation files * [ios, macos] moved script to platform/darwin and updated comments * [ios, macos] Cleaned up the implementation template * [ios, macos] removed unused function and added support for more datatypes * [ios, macos] overhauling the type protocols * [ios, macos] removed unnecessary style classes * [ios, macos] added support for more types * [ios, macos] fixed string and number prop values * [ios, macos] enum getters * [ios, macos] added removeLayer() and removed unused layer ref * [ios, macos] fixed remaining layer types and converted style layer into a protocol * [ios, macos] fixed addLayer() and added example for line layer * [ios] GeoJSON source now works * [ios] fixed raster layer and raster source * [ios] fixed attr prop number and outlined prop function * [ios] wip functions * [ios] bool and float function fix * [ios] cleanup * [macos] fixed support for macos * [ios] fixed string functions * [ios] extended array functions * [ios] added tests and fixed a few bugs * [ios] less verbose functions and improved tests * [ios, macos] Removed unnecessary use of default arguments Default arguments aren’t supported in Node v4, and they aren’t needed here anyways, because we’re only testing for truthiness. * [ios, macos] Enum setters Rely on a macro instead of category methods to specialize the setter implementation for enum attributes, since generic types are disallowed in Objective-C method signatures and mbgl::style::PropertyType must be type-qualified. * [ios, macos] Got macOS closer to parity w/ iOS Added various classes and test classes to the macOS workspace. Also fixed lots of compiler errors and updated macosapp runtime styling example to use the new dictionary syntax for function stops. Updated all conversions from Objective-C stops to C++ stops to enumerate over the dictionary. Fixed compiler errors in enum setter implementations. Also corrected path to script in generated file comments. * [ios, macos] Added EJS templates to project * [ios, macos] Code formatting Made code format more consistent. * [ios, macos] Spelled out ID Cocoa convention is to always spell out “ID” as “identifier”, in part to avoid confusion with the id keyword. Also, URL is capitalized in most contexts, including property names. * [ios, macos] Grouped related headers together * [ios, macos] Cleaned up layer transformation Also added support for converting background layers into Objective-C. * [ios, macos] Cleaned up tests Also made the tests work on macOS by introducing a new window to host the map. * [ios, macos] Replaced TODOs with #warnings * [ios] convert array based property values * [ios, macos] color function/undefined getter * [ios, macos] fixed function/undefined getters for bool and float properties * [ios, macos] more function/undefined property getters * [ios, macos] more type conversion and cleanup * [ios, macos] disable macos runtime styling tests for now * [ios, macos] cleaned up style code script * [ios, macos] more type conversion * [ios] added a base layer to handle visibility min/max zoom * [macos] fixed base layer * [ios, macos] use accessor methods * [ios, macos] cleanup * [ios, macos] add geojson to ios and macos * [macos] rebase fix * [ios, macos] fixed enum getters and added tests for enums * [ios, macos] added an update method to base layer * [ios, macos] added some documentation * [ios, macos] docs * [ios, macos] removed refs to filters for now * [ios, macos] various tail work * [ios, macos] missing import and incorrect type
119 lines
3.1 KiB
CMake
119 lines
3.1 KiB
CMake
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11)
|
|
|
|
mason_use(glfw VERSION 3.1.2)
|
|
mason_use(boost_libprogram_options VERSION 1.60.0)
|
|
mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
|
|
|
|
include(cmake/loop-darwin.cmake)
|
|
|
|
macro(mbgl_platform_core)
|
|
target_sources(mbgl-core
|
|
# File source
|
|
PRIVATE platform/darwin/src/http_file_source.mm
|
|
PRIVATE platform/default/asset_file_source.cpp
|
|
PRIVATE platform/default/default_file_source.cpp
|
|
PRIVATE platform/default/online_file_source.cpp
|
|
|
|
# Offline
|
|
PRIVATE platform/default/mbgl/storage/offline.cpp
|
|
PRIVATE platform/default/mbgl/storage/offline_database.cpp
|
|
PRIVATE platform/default/mbgl/storage/offline_database.hpp
|
|
PRIVATE platform/default/mbgl/storage/offline_download.cpp
|
|
PRIVATE platform/default/mbgl/storage/offline_download.hpp
|
|
PRIVATE platform/default/sqlite3.cpp
|
|
PRIVATE platform/default/sqlite3.hpp
|
|
|
|
# Misc
|
|
PRIVATE platform/darwin/src/log_nslog.mm
|
|
PRIVATE platform/darwin/src/nsthread.mm
|
|
PRIVATE platform/darwin/src/reachability.m
|
|
PRIVATE platform/darwin/src/string_nsstring.mm
|
|
|
|
# Image handling
|
|
PRIVATE platform/darwin/src/image.mm
|
|
|
|
# Headless view
|
|
PRIVATE platform/darwin/src/headless_view_cgl.cpp
|
|
PRIVATE platform/default/headless_display.cpp
|
|
PRIVATE platform/default/headless_view.cpp
|
|
)
|
|
|
|
target_add_mason_package(mbgl-core PUBLIC geojson)
|
|
|
|
target_compile_options(mbgl-core
|
|
PRIVATE -fobjc-arc
|
|
)
|
|
|
|
target_include_directories(mbgl-core
|
|
PRIVATE platform/default
|
|
)
|
|
|
|
target_link_libraries(mbgl-core
|
|
PUBLIC -lz
|
|
)
|
|
endmacro()
|
|
|
|
|
|
macro(mbgl_platform_glfw)
|
|
target_link_libraries(mbgl-glfw
|
|
PRIVATE mbgl-loop
|
|
PRIVATE "-lsqlite3"
|
|
)
|
|
endmacro()
|
|
|
|
|
|
macro(mbgl_platform_render)
|
|
target_link_libraries(mbgl-render
|
|
PRIVATE mbgl-loop
|
|
PRIVATE "-framework Foundation"
|
|
PRIVATE "-framework CoreGraphics"
|
|
PRIVATE "-framework OpenGL"
|
|
PRIVATE "-framework ImageIO"
|
|
PRIVATE "-framework CoreServices"
|
|
PRIVATE "-lsqlite3"
|
|
)
|
|
endmacro()
|
|
|
|
|
|
macro(mbgl_platform_offline)
|
|
target_link_libraries(mbgl-offline
|
|
PRIVATE mbgl-loop
|
|
PRIVATE "-framework Foundation"
|
|
PRIVATE "-framework CoreGraphics"
|
|
PRIVATE "-framework OpenGL"
|
|
PRIVATE "-framework ImageIO"
|
|
PRIVATE "-framework CoreServices"
|
|
PRIVATE "-lsqlite3"
|
|
)
|
|
endmacro()
|
|
|
|
|
|
macro(mbgl_platform_test)
|
|
target_sources(mbgl-test
|
|
PRIVATE test/src/main.cpp
|
|
)
|
|
|
|
set_source_files_properties(
|
|
test/src/main.cpp
|
|
PROPERTIES
|
|
COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}"
|
|
)
|
|
|
|
target_link_libraries(mbgl-test
|
|
PRIVATE mbgl-loop
|
|
PRIVATE "-framework Foundation"
|
|
PRIVATE "-framework CoreGraphics"
|
|
PRIVATE "-framework OpenGL"
|
|
PRIVATE "-framework ImageIO"
|
|
PRIVATE "-framework CoreServices"
|
|
PRIVATE "-lsqlite3"
|
|
)
|
|
endmacro()
|
|
|
|
|
|
macro(mbgl_platform_node)
|
|
target_link_libraries(mbgl-node
|
|
PRIVATE "-framework Foundation"
|
|
)
|
|
endmacro()
|