diff options
Diffstat (limited to 'platform/linux/config.cmake')
| -rw-r--r-- | platform/linux/config.cmake | 76 |
1 files changed, 45 insertions, 31 deletions
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 41e7f71b99..dd5f0af112 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -1,6 +1,5 @@ -mason_use(glfw VERSION 2017-02-09-77a8f10) +mason_use(glfw VERSION 2017-07-13-67c9155) mason_use(mesa VERSION 13.0.4) -mason_use(boost_libprogram_options VERSION 1.62.0${MASON_CXXABI_SUFFIX}) mason_use(sqlite VERSION 3.14.2) mason_use(libuv VERSION 1.9.1) mason_use(nunicode VERSION 1.7.1) @@ -8,12 +7,11 @@ mason_use(libpng VERSION 1.6.25) mason_use(libjpeg-turbo VERSION 1.5.0) mason_use(webp VERSION 0.5.1) mason_use(gtest VERSION 1.8.0${MASON_CXXABI_SUFFIX}) -mason_use(benchmark VERSION 1.0.0-1) +mason_use(benchmark VERSION 1.2.0) mason_use(icu VERSION 58.1-min-size) +mason_use(args VERSION 6.2.0 HEADER_ONLY) -# Link with libuv. This is not part of loop-uv.cmake because loop-uv.cmake is also -# used by node.cmake, where we want to link with the libuv provided by node itself. -target_add_mason_package(mbgl-loop-uv PUBLIC libuv) +include(cmake/loop-uv.cmake) macro(mbgl_platform_core) target_add_mason_package(mbgl-core PUBLIC mesa) @@ -21,7 +19,6 @@ macro(mbgl_platform_core) if(WITH_OSMESA) target_sources(mbgl-core PRIVATE platform/default/headless_backend_osmesa.cpp - PRIVATE platform/default/mbgl/gl/headless_display.cpp ) target_link_libraries(mbgl-core PUBLIC -lOSMesa @@ -29,17 +26,14 @@ macro(mbgl_platform_core) elseif(WITH_EGL) target_sources(mbgl-core PRIVATE platform/linux/src/headless_backend_egl.cpp - PRIVATE platform/linux/src/headless_display_egl.cpp ) target_link_libraries(mbgl-core PUBLIC -lGLESv2 PUBLIC -lEGL - PUBLIC -lgbm ) else() target_sources(mbgl-core PRIVATE platform/linux/src/headless_backend_glx.cpp - PRIVATE platform/linux/src/headless_display_glx.cpp ) target_link_libraries(mbgl-core PUBLIC -lGL @@ -48,27 +42,13 @@ macro(mbgl_platform_core) endif() target_sources(mbgl-core - # File source - PRIVATE platform/default/asset_file_source.cpp - PRIVATE platform/default/default_file_source.cpp - PRIVATE platform/default/local_file_source.cpp - PRIVATE platform/default/http_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/default/logging_stderr.cpp PRIVATE platform/default/string_stdlib.cpp PRIVATE platform/default/thread.cpp PRIVATE platform/default/bidi.cpp + PRIVATE platform/default/local_glyph_rasterizer.cpp + PRIVATE platform/default/thread_local.cpp PRIVATE platform/default/utf.cpp # Image handling @@ -79,11 +59,10 @@ macro(mbgl_platform_core) PRIVATE platform/default/webp_reader.cpp # Headless view + PRIVATE platform/default/mbgl/gl/headless_frontend.cpp + PRIVATE platform/default/mbgl/gl/headless_frontend.hpp PRIVATE platform/default/mbgl/gl/headless_backend.cpp PRIVATE platform/default/mbgl/gl/headless_backend.hpp - PRIVATE platform/default/mbgl/gl/headless_display.hpp - PRIVATE platform/default/mbgl/gl/offscreen_view.cpp - PRIVATE platform/default/mbgl/gl/offscreen_view.hpp # Thread pool PRIVATE platform/default/mbgl/util/default_thread_pool.cpp @@ -93,9 +72,9 @@ macro(mbgl_platform_core) target_include_directories(mbgl-core PRIVATE platform/default + PRIVATE platform/linux ) - target_add_mason_package(mbgl-core PUBLIC sqlite) target_add_mason_package(mbgl-core PUBLIC nunicode) target_add_mason_package(mbgl-core PUBLIC libpng) target_add_mason_package(mbgl-core PUBLIC libjpeg-turbo) @@ -104,6 +83,22 @@ macro(mbgl_platform_core) target_link_libraries(mbgl-core PUBLIC -lz + ) +endmacro() + + +macro(mbgl_filesource) + target_sources(mbgl-filesource + # File source + PRIVATE platform/default/http_file_source.cpp + + # Database + PRIVATE platform/default/sqlite3.cpp + ) + + target_add_mason_package(mbgl-filesource PUBLIC sqlite) + + target_link_libraries(mbgl-filesource PUBLIC -lcurl ) endmacro() @@ -111,13 +106,16 @@ endmacro() macro(mbgl_platform_glfw) target_link_libraries(mbgl-glfw + PRIVATE mbgl-filesource PRIVATE mbgl-loop-uv ) + target_add_mason_package(mbgl-glfw PUBLIC libuv) + add_custom_command( TARGET mbgl-glfw POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/common/ca-bundle.crt + ${CMAKE_SOURCE_DIR}/misc/ca-bundle.crt ${CMAKE_CURRENT_BINARY_DIR}/ca-bundle.crt ) endmacro() @@ -125,15 +123,21 @@ endmacro() macro(mbgl_platform_render) target_link_libraries(mbgl-render + PRIVATE mbgl-filesource PRIVATE mbgl-loop-uv ) + + target_add_mason_package(mbgl-render PUBLIC libuv) endmacro() macro(mbgl_platform_offline) target_link_libraries(mbgl-offline + PRIVATE mbgl-filesource PRIVATE mbgl-loop-uv ) + + target_add_mason_package(mbgl-offline PUBLIC libuv) endmacro() @@ -142,6 +146,10 @@ macro(mbgl_platform_test) PRIVATE platform/default/mbgl/test/main.cpp ) + target_include_directories(mbgl-test + PRIVATE platform/linux + ) + set_source_files_properties( platform/default/mbgl/test/main.cpp PROPERTIES @@ -149,8 +157,11 @@ macro(mbgl_platform_test) ) target_link_libraries(mbgl-test + PRIVATE mbgl-filesource PRIVATE mbgl-loop-uv ) + + target_add_mason_package(mbgl-test PUBLIC libuv) endmacro() @@ -166,8 +177,11 @@ macro(mbgl_platform_benchmark) ) target_link_libraries(mbgl-benchmark + PRIVATE mbgl-filesource PRIVATE mbgl-loop-uv ) + + target_add_mason_package(mbgl-benchmark PUBLIC libuv) endmacro() |