From bded6c65d59b6da9e7cd6d4787e5f707a62a8285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Mon, 20 Aug 2018 13:32:44 +0200 Subject: [build] use plain text files for file lists to simplify integration with other build systems --- platform/android/config.cmake | 237 +----------------------------------------- 1 file changed, 2 insertions(+), 235 deletions(-) (limited to 'platform/android/config.cmake') diff --git a/platform/android/config.cmake b/platform/android/config.cmake index be9d95ef0a..84c508dd73 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -1,5 +1,4 @@ add_definitions(-DMBGL_USE_GLES2=1) -include(cmake/test-files.cmake) include(cmake/nunicode.cmake) # Build thin archives. @@ -34,210 +33,7 @@ set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWIT ## mbgl core ## macro(mbgl_platform_core) - target_sources(mbgl-core - # Loop - PRIVATE platform/android/src/async_task.cpp - PRIVATE platform/android/src/run_loop.cpp - PRIVATE platform/android/src/run_loop_impl.hpp - PRIVATE platform/android/src/timer.cpp - - # Misc - PRIVATE platform/android/src/text/collator.cpp - PRIVATE platform/android/src/text/collator_jni.hpp - PRIVATE platform/android/src/text/local_glyph_rasterizer.cpp - PRIVATE platform/android/src/text/local_glyph_rasterizer_jni.hpp - PRIVATE platform/android/src/logging_android.cpp - PRIVATE platform/android/src/thread.cpp - PRIVATE platform/default/string_stdlib.cpp - PRIVATE platform/default/bidi.cpp - PRIVATE platform/default/thread_local.cpp - PRIVATE platform/default/unaccent.cpp - PRIVATE platform/default/unaccent.hpp - PRIVATE platform/default/utf.cpp - - # Image handling - PRIVATE platform/default/png_writer.cpp - PRIVATE platform/android/src/bitmap.cpp - PRIVATE platform/android/src/bitmap.hpp - PRIVATE platform/android/src/bitmap_factory.cpp - PRIVATE platform/android/src/bitmap_factory.hpp - PRIVATE platform/android/src/image.cpp - - # Thread pool - PRIVATE platform/default/mbgl/util/shared_thread_pool.cpp - PRIVATE platform/default/mbgl/util/shared_thread_pool.hpp - PRIVATE platform/default/mbgl/util/default_thread_pool.cpp - PRIVATE platform/default/mbgl/util/default_thread_pool.hpp - - # Rendering - PRIVATE platform/android/src/android_renderer_backend.cpp - PRIVATE platform/android/src/android_renderer_backend.hpp - PRIVATE platform/android/src/android_renderer_frontend.cpp - PRIVATE platform/android/src/android_renderer_frontend.hpp - - # Snapshots (core) - PRIVATE platform/default/mbgl/gl/headless_backend.cpp - PRIVATE platform/default/mbgl/gl/headless_backend.hpp - PRIVATE platform/default/mbgl/gl/headless_frontend.cpp - PRIVATE platform/default/mbgl/gl/headless_frontend.hpp - PRIVATE platform/default/mbgl/map/map_snapshotter.cpp - PRIVATE platform/default/mbgl/map/map_snapshotter.hpp - PRIVATE platform/linux/src/headless_backend_egl.cpp - - # Conversion C++ -> Java - PRIVATE platform/android/src/conversion/constant.hpp - PRIVATE platform/android/src/conversion/conversion.hpp - PRIVATE platform/android/src/style/conversion/property_expression.hpp - PRIVATE platform/android/src/style/conversion/property_value.hpp - PRIVATE platform/android/src/style/conversion/types.hpp - PRIVATE platform/android/src/style/conversion/types_string_values.hpp - PRIVATE platform/android/src/map/camera_position.cpp - PRIVATE platform/android/src/map/camera_position.hpp - PRIVATE platform/android/src/map/image.cpp - PRIVATE platform/android/src/map/image.hpp - - # Style conversion Java -> C++ - PRIVATE platform/android/src/style/android_conversion.hpp - PRIVATE platform/android/src/style/value.cpp - PRIVATE platform/android/src/style/value.hpp - PRIVATE platform/android/src/style/conversion/url_or_tileset.hpp - - # Style - PRIVATE platform/android/src/style/transition_options.cpp - PRIVATE platform/android/src/style/transition_options.hpp - PRIVATE platform/android/src/style/layers/background_layer.cpp - PRIVATE platform/android/src/style/layers/background_layer.hpp - PRIVATE platform/android/src/style/layers/circle_layer.cpp - PRIVATE platform/android/src/style/layers/circle_layer.hpp - PRIVATE platform/android/src/style/layers/custom_layer.cpp - PRIVATE platform/android/src/style/layers/custom_layer.hpp - PRIVATE platform/android/src/style/layers/fill_extrusion_layer.cpp - PRIVATE platform/android/src/style/layers/fill_extrusion_layer.hpp - PRIVATE platform/android/src/style/layers/fill_layer.cpp - PRIVATE platform/android/src/style/layers/fill_layer.hpp - PRIVATE platform/android/src/style/layers/heatmap_layer.cpp - PRIVATE platform/android/src/style/layers/heatmap_layer.hpp - PRIVATE platform/android/src/style/layers/hillshade_layer.cpp - PRIVATE platform/android/src/style/layers/hillshade_layer.hpp - PRIVATE platform/android/src/style/layers/layer.cpp - PRIVATE platform/android/src/style/layers/layer.hpp - PRIVATE platform/android/src/style/layers/layers.cpp - PRIVATE platform/android/src/style/layers/layers.hpp - PRIVATE platform/android/src/style/layers/line_layer.cpp - PRIVATE platform/android/src/style/layers/line_layer.hpp - PRIVATE platform/android/src/style/layers/raster_layer.cpp - PRIVATE platform/android/src/style/layers/raster_layer.hpp - PRIVATE platform/android/src/style/layers/symbol_layer.cpp - PRIVATE platform/android/src/style/layers/symbol_layer.hpp - PRIVATE platform/android/src/style/layers/unknown_layer.cpp - PRIVATE platform/android/src/style/layers/unknown_layer.hpp - PRIVATE platform/android/src/style/sources/geojson_source.cpp - PRIVATE platform/android/src/style/sources/geojson_source.hpp - PRIVATE platform/android/src/style/sources/custom_geometry_source.cpp - PRIVATE platform/android/src/style/sources/custom_geometry_source.hpp - PRIVATE platform/android/src/style/sources/source.cpp - PRIVATE platform/android/src/style/sources/source.hpp - PRIVATE platform/android/src/style/sources/raster_source.cpp - PRIVATE platform/android/src/style/sources/raster_source.hpp - PRIVATE platform/android/src/style/sources/unknown_source.cpp - PRIVATE platform/android/src/style/sources/unknown_source.hpp - PRIVATE platform/android/src/style/sources/vector_source.cpp - PRIVATE platform/android/src/style/sources/vector_source.hpp - PRIVATE platform/android/src/style/sources/image_source.hpp - PRIVATE platform/android/src/style/sources/image_source.cpp - PRIVATE platform/android/src/style/sources/raster_dem_source.cpp - PRIVATE platform/android/src/style/sources/raster_dem_source.hpp - PRIVATE platform/android/src/style/position.cpp - PRIVATE platform/android/src/style/position.hpp - PRIVATE platform/android/src/style/light.cpp - PRIVATE platform/android/src/style/light.hpp - - # Native map - PRIVATE platform/android/src/native_map_view.cpp - PRIVATE platform/android/src/native_map_view.hpp - PRIVATE platform/android/src/map_renderer.cpp - PRIVATE platform/android/src/map_renderer.hpp - PRIVATE platform/android/src/map_renderer_runnable.cpp - PRIVATE platform/android/src/map_renderer_runnable.hpp - - # Java core classes - PRIVATE platform/android/src/java/lang.cpp - PRIVATE platform/android/src/java/lang.hpp - PRIVATE platform/android/src/java/util.cpp - PRIVATE platform/android/src/java/util.hpp - - # Graphics - PRIVATE platform/android/src/graphics/pointf.cpp - PRIVATE platform/android/src/graphics/pointf.hpp - PRIVATE platform/android/src/graphics/rectf.cpp - PRIVATE platform/android/src/graphics/rectf.hpp - - # GeoJSON - PRIVATE platform/android/src/geojson/feature.cpp - PRIVATE platform/android/src/geojson/feature.hpp - PRIVATE platform/android/src/geojson/feature_collection.cpp - PRIVATE platform/android/src/geojson/feature_collection.hpp - PRIVATE platform/android/src/geojson/geometry.cpp - PRIVATE platform/android/src/geojson/geometry.hpp - PRIVATE platform/android/src/geojson/geometry_collection.cpp - PRIVATE platform/android/src/geojson/geometry_collection.hpp - PRIVATE platform/android/src/geojson/line_string.cpp - PRIVATE platform/android/src/geojson/line_string.hpp - PRIVATE platform/android/src/geojson/multi_line_string.cpp - PRIVATE platform/android/src/geojson/multi_line_string.hpp - PRIVATE platform/android/src/geojson/multi_point.cpp - PRIVATE platform/android/src/geojson/multi_point.hpp - PRIVATE platform/android/src/geojson/multi_polygon.cpp - PRIVATE platform/android/src/geojson/multi_polygon.hpp - PRIVATE platform/android/src/geojson/point.cpp - PRIVATE platform/android/src/geojson/point.hpp - PRIVATE platform/android/src/geojson/polygon.cpp - PRIVATE platform/android/src/geojson/polygon.hpp - - # Geometry - PRIVATE platform/android/src/geometry/lat_lng.cpp - PRIVATE platform/android/src/geometry/lat_lng.hpp - PRIVATE platform/android/src/geometry/lat_lng_bounds.cpp - PRIVATE platform/android/src/geometry/lat_lng_bounds.hpp - PRIVATE platform/android/src/geometry/lat_lng_quad.cpp - PRIVATE platform/android/src/geometry/lat_lng_quad.hpp - PRIVATE platform/android/src/geometry/projected_meters.cpp - PRIVATE platform/android/src/geometry/projected_meters.hpp - - # GSon - PRIVATE platform/android/src/gson/json_array.cpp - PRIVATE platform/android/src/gson/json_array.hpp - PRIVATE platform/android/src/gson/json_element.cpp - PRIVATE platform/android/src/gson/json_element.hpp - PRIVATE platform/android/src/gson/json_object.cpp - PRIVATE platform/android/src/gson/json_object.hpp - PRIVATE platform/android/src/gson/json_primitive.cpp - PRIVATE platform/android/src/gson/json_primitive.hpp - - # Annotation - PRIVATE platform/android/src/annotation/marker.cpp - PRIVATE platform/android/src/annotation/marker.hpp - PRIVATE platform/android/src/annotation/polygon.cpp - PRIVATE platform/android/src/annotation/polygon.hpp - PRIVATE platform/android/src/annotation/polyline.cpp - PRIVATE platform/android/src/annotation/polyline.hpp - - # Snapshots (SDK) - PRIVATE platform/android/src/snapshotter/map_snapshotter.cpp - PRIVATE platform/android/src/snapshotter/map_snapshotter.hpp - PRIVATE platform/android/src/snapshotter/map_snapshot.cpp - PRIVATE platform/android/src/snapshotter/map_snapshot.hpp - - # Main jni bindings - PRIVATE platform/android/src/attach_env.cpp - PRIVATE platform/android/src/attach_env.hpp - PRIVATE platform/android/src/java_types.cpp - PRIVATE platform/android/src/java_types.hpp - - # Main entry point - PRIVATE platform/android/src/jni.hpp - PRIVATE platform/android/src/jni.cpp - ) + target_sources_from_file(mbgl-core PRIVATE platform/android/core-files.txt) target_include_directories(mbgl-core PUBLIC platform/default @@ -265,36 +61,7 @@ endmacro() macro(mbgl_filesource) - target_sources(mbgl-filesource - # File source - PRIVATE platform/android/src/http_file_source.cpp - PRIVATE platform/android/src/asset_manager.hpp - PRIVATE platform/android/src/asset_manager_file_source.cpp - PRIVATE platform/android/src/asset_manager_file_source.hpp - - # FileSource holder - PRIVATE platform/android/src/file_source.cpp - PRIVATE platform/android/src/file_source.hpp - - # Connectivity - PRIVATE platform/android/src/connectivity_listener.cpp - PRIVATE platform/android/src/connectivity_listener.hpp - - # Offline - PRIVATE platform/android/src/offline/offline_manager.cpp - PRIVATE platform/android/src/offline/offline_manager.hpp - PRIVATE platform/android/src/offline/offline_region.cpp - PRIVATE platform/android/src/offline/offline_region.hpp - PRIVATE platform/android/src/offline/offline_region_definition.cpp - PRIVATE platform/android/src/offline/offline_region_definition.hpp - PRIVATE platform/android/src/offline/offline_region_error.cpp - PRIVATE platform/android/src/offline/offline_region_error.hpp - PRIVATE platform/android/src/offline/offline_region_status.cpp - PRIVATE platform/android/src/offline/offline_region_status.hpp - - # Database - PRIVATE platform/default/sqlite3.cpp - ) + target_sources_from_file(mbgl-filesource PRIVATE platform/android/filesource-files.txt) target_add_mason_package(mbgl-filesource PUBLIC sqlite) target_add_mason_package(mbgl-filesource PUBLIC jni.hpp) -- cgit v1.2.1