diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-06-03 18:05:04 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
commit | 692fe1f3ffc8f4364b39c14aa7d90cec2ff5c0a6 (patch) | |
tree | 1d08af7d56e986dba2b548ff9b9a7e1a77c713ed /platform/linux | |
parent | e3ee55b28d0b230d054c9718f79a1f6d685cd62b (diff) | |
download | qtlocation-mapboxgl-692fe1f3ffc8f4364b39c14aa7d90cec2ff5c0a6.tar.gz |
[build] switch to CMake
This is very much a work in progress.
Diffstat (limited to 'platform/linux')
-rw-r--r-- | platform/linux/config.cmake | 105 | ||||
-rwxr-xr-x | platform/linux/ninja | bin | 0 -> 175240 bytes | |||
-rw-r--r-- | platform/linux/platform.gyp | 125 | ||||
-rw-r--r-- | platform/linux/scripts/configure.sh | 33 |
4 files changed, 105 insertions, 158 deletions
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake new file mode 100644 index 0000000000..814a249849 --- /dev/null +++ b/platform/linux/config.cmake @@ -0,0 +1,105 @@ +mason_use(glfw 3.1.2) +mason_use(boost_libprogram_options 1.60.0) +mason_use(sqlite 3.9.1) +mason_use(libuv 1.7.5) +mason_use(nunicode 1.6) +mason_use(libpng 1.6.20) +mason_use(libjpeg-turbo 1.4.2) +mason_use(webp 0.5.0) + +include(cmake/loop-uv.cmake) + +macro(mbgl_platform_core) + target_sources(mbgl-core + # File source + PRIVATE platform/default/asset_file_source.cpp + PRIVATE platform/default/default_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/log_stderr.cpp + PRIVATE platform/default/string_stdlib.cpp + PRIVATE platform/default/thread.cpp + + # Image handling + PRIVATE platform/default/image.cpp + PRIVATE platform/default/jpeg_reader.cpp + PRIVATE platform/default/png_reader.cpp + PRIVATE platform/default/webp_reader.cpp + + # Headless view + PRIVATE platform/default/headless_display.cpp + PRIVATE platform/default/headless_view.cpp + PRIVATE platform/default/headless_view_glx.cpp + ) + + target_include_directories(mbgl-core + PRIVATE platform/default + ) + + 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) + target_add_mason_package(mbgl-core PUBLIC webp) + + target_link_libraries(mbgl-core + PUBLIC -lz + PUBLIC -lcurl + PUBLIC -lGL + PUBLIC -lX11 + ) +endmacro() + + +macro(mbgl_platform_glfw) + target_link_libraries(mbgl-glfw + PRIVATE mbgl-loop + ) +endmacro() + + +macro(mbgl_platform_render) + target_link_libraries(mbgl-render + PRIVATE mbgl-loop + ) +endmacro() + + +macro(mbgl_platform_offline) + target_link_libraries(mbgl-offline + PRIVATE mbgl-loop + ) +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 + ) +endmacro() + + +macro(mbgl_platform_node) + # Enabling node module by defining this macro +endmacro() diff --git a/platform/linux/ninja b/platform/linux/ninja Binary files differnew file mode 100755 index 0000000000..189832fdb4 --- /dev/null +++ b/platform/linux/ninja diff --git a/platform/linux/platform.gyp b/platform/linux/platform.gyp deleted file mode 100644 index 7adf5337c4..0000000000 --- a/platform/linux/platform.gyp +++ /dev/null @@ -1,125 +0,0 @@ -{ - 'variables': { - 'loop_lib': 'uv', - 'headless_lib': 'glx', - 'coverage': '<!(echo $ENABLE_COVERAGE)>', - }, - 'conditions': [ - ['OS == "mac"', { - 'variables': { - 'headless_lib': 'cgl', - } - }], - ], - 'includes': [ - '../../mbgl.gypi', - '../../test/test.gypi', - '../../benchmark/benchmark.gypi', - '../../bin/glfw.gypi', - '../../bin/render.gypi', - '../../bin/offline.gypi', - ], - 'targets': [ - { - 'target_name': 'test', - 'type': 'executable', - - 'dependencies': [ - 'test-lib', - 'platform-lib', - 'copy_certificate_bundle', - ], - - 'sources': [ - '../../test/src/main.cpp', - ], - }, - { - 'target_name': 'benchmark', - 'type': 'executable', - - 'dependencies': [ - 'benchmark-lib', - 'platform-lib', - ], - - 'sources': [ - '../../benchmark/src/main.cpp', - ], - }, - { - 'target_name': 'platform-lib', - 'product_name': 'mbgl-platform-linux', - 'type': 'static_library', - 'standalone_static_library': 1, - 'hard_dependency': 1, - 'dependencies': [ - 'core', - ], - - 'include_dirs': [ - '../default', - '../../include', - '../../src', # TODO: eliminate - ], - - 'sources': [ - '../default/log_stderr.cpp', - '../default/string_stdlib.cpp', - '../default/thread.cpp', - '../default/image.cpp', - '../default/webp_reader.cpp', - '../default/png_reader.cpp', - '../default/jpeg_reader.cpp', - '../default/asset_file_source.cpp', - '../default/http_file_source.cpp', - '../default/default_file_source.cpp', - '../default/online_file_source.cpp', - '../default/mbgl/storage/offline.hpp', - '../default/mbgl/storage/offline.cpp', - '../default/mbgl/storage/offline_database.hpp', - '../default/mbgl/storage/offline_database.cpp', - '../default/mbgl/storage/offline_download.hpp', - '../default/mbgl/storage/offline_download.cpp', - '../default/sqlite3.hpp', - '../default/sqlite3.cpp', - ], - - 'cflags_cc': [ - '<@(boost_cflags)', - '<@(nunicode_cflags)', - '<@(sqlite_cflags)', - '<@(rapidjson_cflags)', - '<@(libcurl_cflags)', - '<@(libpng_cflags)', - '<@(libjpeg-turbo_cflags)', - '<@(webp_cflags)', - ], - - 'link_settings': { - 'libraries': [ - '<@(nunicode_static_libs)', - '<@(nunicode_ldflags)', - '<@(sqlite_static_libs)', - '<@(sqlite_ldflags)', - '<@(zlib_static_libs)', - '<@(zlib_ldflags)', - '<@(libcurl_static_libs)', - '<@(libcurl_ldflags)', - '<@(libpng_static_libs)', - '<@(libpng_ldflags)', - '<@(libjpeg-turbo_static_libs)', - '<@(libjpeg-turbo_ldflags)', - '<@(webp_static_libs)', - '<@(webp_ldflags)', - ], - }, - - 'direct_dependent_settings': { - 'include_dirs': [ - '../include', - ], - }, - }, - ], -} diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh deleted file mode 100644 index 3d37994868..0000000000 --- a/platform/linux/scripts/configure.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -CXX11ABI=${CXX11ABI:-$(scripts/check-cxx11abi.sh)} - -UNIQUE_RESOURCE_VERSION=dev -PROTOZERO_VERSION=1.3.0 -BOOST_VERSION=1.60.0 -BOOST_LIBPROGRAM_OPTIONS_VERSION=1.60.0 -LIBCURL_VERSION=system -GLFW_VERSION=3.1.2 -LIBPNG_VERSION=1.6.20 -LIBJPEG_TURBO_VERSION=1.4.2 -SQLITE_VERSION=3.9.1 -LIBUV_VERSION=1.7.5 -ZLIB_VERSION=system -NUNICODE_VERSION=1.6 -GEOMETRY_VERSION=0.8.0 -GEOJSON_VERSION=0.1.4${CXX11ABI:-} -GEOJSONVT_VERSION=6.1.2 -SUPERCLUSTER_VERSION=0.2.0 -KDBUSH_VERSION=0.1.1 -VARIANT_VERSION=1.1.0 -RAPIDJSON_VERSION=1.0.2 -GTEST_VERSION=1.7.0${CXX11ABI:-} -PIXELMATCH_VERSION=0.9.0 -WEBP_VERSION=0.5.0 -EARCUT_VERSION=0.11 -BENCHMARK_VERSION=1.0.0 - -function print_opengl_flags { - CONFIG+=" 'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN - CONFIG+=" 'opengl_ldflags%': $(quote_flags $(pkg-config gl x11 --libs)),"$LN -} |