diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/benchmark.cmake | 6 | ||||
| -rw-r--r-- | cmake/core-files.cmake | 123 | ||||
| -rw-r--r-- | cmake/glfw.cmake | 13 | ||||
| -rw-r--r-- | cmake/loop-darwin.cmake | 2 | ||||
| -rw-r--r-- | cmake/mbgl.cmake | 5 | ||||
| -rw-r--r-- | cmake/node.cmake | 5 | ||||
| -rw-r--r-- | cmake/offline.cmake | 6 | ||||
| -rw-r--r-- | cmake/render.cmake | 1 | ||||
| -rw-r--r-- | cmake/shaders.cmake | 12 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 2 | ||||
| -rw-r--r-- | cmake/test.cmake | 7 |
11 files changed, 88 insertions, 94 deletions
diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake index 79da54459e..0752647a2d 100644 --- a/cmake/benchmark.cmake +++ b/cmake/benchmark.cmake @@ -14,12 +14,6 @@ target_include_directories(mbgl-benchmark PRIVATE platform/default ) -if(DEFINED ENV{CI}) - target_compile_definitions(mbgl-benchmark - PRIVATE -DCI_BUILD=1 - ) -endif() - target_link_libraries(mbgl-benchmark PRIVATE mbgl-core ) diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 4d5cddbc49..3255da66f2 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -54,12 +54,17 @@ set(MBGL_CORE_FILES # gl include/mbgl/gl/gl.hpp - include/mbgl/gl/implementation.hpp + src/mbgl/gl/attribute.cpp src/mbgl/gl/attribute.hpp + src/mbgl/gl/color_mode.cpp + src/mbgl/gl/color_mode.hpp src/mbgl/gl/context.cpp src/mbgl/gl/context.hpp src/mbgl/gl/debugging.cpp src/mbgl/gl/debugging.hpp + src/mbgl/gl/depth_mode.cpp + src/mbgl/gl/depth_mode.hpp + src/mbgl/gl/draw_mode.hpp src/mbgl/gl/extension.cpp src/mbgl/gl/extension.hpp src/mbgl/gl/framebuffer.hpp @@ -67,18 +72,19 @@ set(MBGL_CORE_FILES src/mbgl/gl/index_buffer.hpp src/mbgl/gl/object.cpp src/mbgl/gl/object.hpp + src/mbgl/gl/primitives.hpp + src/mbgl/gl/program.hpp src/mbgl/gl/renderbuffer.hpp - src/mbgl/gl/shader.cpp - src/mbgl/gl/shader.hpp + src/mbgl/gl/segment.hpp src/mbgl/gl/state.hpp + src/mbgl/gl/stencil_mode.cpp + src/mbgl/gl/stencil_mode.hpp src/mbgl/gl/texture.hpp src/mbgl/gl/types.hpp src/mbgl/gl/uniform.cpp src/mbgl/gl/uniform.hpp src/mbgl/gl/value.cpp src/mbgl/gl/value.hpp - src/mbgl/gl/vao.cpp - src/mbgl/gl/vao.hpp src/mbgl/gl/vertex_array.cpp src/mbgl/gl/vertex_array.hpp src/mbgl/gl/vertex_buffer.hpp @@ -112,33 +118,34 @@ set(MBGL_CORE_FILES # math include/mbgl/math/clamp.hpp + include/mbgl/math/log2.hpp include/mbgl/math/minmax.hpp include/mbgl/math/wrap.hpp - - # mbgl - include/mbgl/mbgl.hpp + src/mbgl/math/log2.cpp # parsedate src/parsedate/parsedate.c src/parsedate/parsedate.h - # platform - include/mbgl/platform/event.hpp - include/mbgl/platform/log.hpp - include/mbgl/platform/platform.hpp - src/mbgl/platform/event.cpp - src/mbgl/platform/log.cpp - - # platform/darwin - include/mbgl/platform/darwin/reachability.h - - # platform/default - include/mbgl/platform/default/glfw_view.hpp - include/mbgl/platform/default/headless_backend.hpp - include/mbgl/platform/default/headless_display.hpp - include/mbgl/platform/default/offscreen_view.hpp - include/mbgl/platform/default/settings_json.hpp - include/mbgl/platform/default/thread_pool.hpp + # programs + src/mbgl/programs/attributes.hpp + src/mbgl/programs/circle_program.cpp + src/mbgl/programs/circle_program.hpp + src/mbgl/programs/collision_box_program.cpp + src/mbgl/programs/collision_box_program.hpp + src/mbgl/programs/debug_program.hpp + src/mbgl/programs/fill_program.cpp + src/mbgl/programs/fill_program.hpp + src/mbgl/programs/line_program.cpp + src/mbgl/programs/line_program.hpp + src/mbgl/programs/program.hpp + src/mbgl/programs/program_parameters.hpp + src/mbgl/programs/programs.hpp + src/mbgl/programs/raster_program.cpp + src/mbgl/programs/raster_program.hpp + src/mbgl/programs/symbol_program.cpp + src/mbgl/programs/symbol_program.hpp + src/mbgl/programs/uniforms.hpp # renderer src/mbgl/renderer/bucket.hpp @@ -146,7 +153,6 @@ set(MBGL_CORE_FILES src/mbgl/renderer/circle_bucket.hpp src/mbgl/renderer/debug_bucket.cpp src/mbgl/renderer/debug_bucket.hpp - src/mbgl/renderer/element_group.hpp src/mbgl/renderer/fill_bucket.cpp src/mbgl/renderer/fill_bucket.hpp src/mbgl/renderer/frame_history.cpp @@ -173,45 +179,6 @@ set(MBGL_CORE_FILES src/mbgl/renderer/symbol_bucket.cpp src/mbgl/renderer/symbol_bucket.hpp - # shader - src/mbgl/shader/circle_shader.cpp - src/mbgl/shader/circle_shader.hpp - src/mbgl/shader/circle_vertex.cpp - src/mbgl/shader/circle_vertex.hpp - src/mbgl/shader/collision_box_shader.cpp - src/mbgl/shader/collision_box_shader.hpp - src/mbgl/shader/collision_box_vertex.cpp - src/mbgl/shader/collision_box_vertex.hpp - src/mbgl/shader/fill_outline_pattern_shader.cpp - src/mbgl/shader/fill_outline_pattern_shader.hpp - src/mbgl/shader/fill_outline_shader.cpp - src/mbgl/shader/fill_outline_shader.hpp - src/mbgl/shader/fill_pattern_shader.cpp - src/mbgl/shader/fill_pattern_shader.hpp - src/mbgl/shader/fill_shader.cpp - src/mbgl/shader/fill_shader.hpp - src/mbgl/shader/fill_vertex.cpp - src/mbgl/shader/fill_vertex.hpp - src/mbgl/shader/line_pattern_shader.cpp - src/mbgl/shader/line_pattern_shader.hpp - src/mbgl/shader/line_sdf_shader.cpp - src/mbgl/shader/line_sdf_shader.hpp - src/mbgl/shader/line_shader.cpp - src/mbgl/shader/line_shader.hpp - src/mbgl/shader/line_vertex.cpp - src/mbgl/shader/line_vertex.hpp - src/mbgl/shader/raster_shader.cpp - src/mbgl/shader/raster_shader.hpp - src/mbgl/shader/raster_vertex.cpp - src/mbgl/shader/raster_vertex.hpp - src/mbgl/shader/shaders.hpp - src/mbgl/shader/symbol_icon_shader.cpp - src/mbgl/shader/symbol_icon_shader.hpp - src/mbgl/shader/symbol_sdf_shader.cpp - src/mbgl/shader/symbol_sdf_shader.hpp - src/mbgl/shader/symbol_vertex.cpp - src/mbgl/shader/symbol_vertex.hpp - # sprite include/mbgl/sprite/sprite_image.hpp src/mbgl/sprite/sprite_atlas.cpp @@ -248,10 +215,12 @@ set(MBGL_CORE_FILES include/mbgl/style/types.hpp src/mbgl/style/bucket_parameters.cpp src/mbgl/style/bucket_parameters.hpp - src/mbgl/style/calculation_parameters.hpp src/mbgl/style/cascade_parameters.hpp src/mbgl/style/class_dictionary.cpp src/mbgl/style/class_dictionary.hpp + src/mbgl/style/cross_faded_property_evaluator.cpp + src/mbgl/style/cross_faded_property_evaluator.hpp + src/mbgl/style/function.cpp src/mbgl/style/layer.cpp src/mbgl/style/layer_impl.cpp src/mbgl/style/layer_impl.hpp @@ -261,7 +230,7 @@ set(MBGL_CORE_FILES src/mbgl/style/paint_property.hpp src/mbgl/style/parser.cpp src/mbgl/style/parser.hpp - src/mbgl/style/property_evaluator.cpp + src/mbgl/style/property_evaluation_parameters.hpp src/mbgl/style/property_evaluator.hpp src/mbgl/style/property_parsing.cpp src/mbgl/style/property_parsing.hpp @@ -296,6 +265,7 @@ set(MBGL_CORE_FILES include/mbgl/style/layers/background_layer.hpp include/mbgl/style/layers/circle_layer.hpp include/mbgl/style/layers/custom_layer.hpp + include/mbgl/style/layers/fill_extrusion_layer.hpp include/mbgl/style/layers/fill_layer.hpp include/mbgl/style/layers/line_layer.hpp include/mbgl/style/layers/raster_layer.hpp @@ -313,6 +283,11 @@ set(MBGL_CORE_FILES src/mbgl/style/layers/custom_layer.cpp src/mbgl/style/layers/custom_layer_impl.cpp src/mbgl/style/layers/custom_layer_impl.hpp + src/mbgl/style/layers/fill_extrusion_layer.cpp + src/mbgl/style/layers/fill_extrusion_layer_impl.cpp + src/mbgl/style/layers/fill_extrusion_layer_impl.hpp + src/mbgl/style/layers/fill_extrusion_layer_properties.cpp + src/mbgl/style/layers/fill_extrusion_layer_properties.hpp src/mbgl/style/layers/fill_layer.cpp src/mbgl/style/layers/fill_layer_impl.cpp src/mbgl/style/layers/fill_layer_impl.hpp @@ -349,6 +324,7 @@ set(MBGL_CORE_FILES src/mbgl/style/sources/vector_source_impl.hpp # text + src/mbgl/text/bidi.hpp src/mbgl/text/check_max_angle.cpp src/mbgl/text/check_max_angle.hpp src/mbgl/text/collision_feature.cpp @@ -406,8 +382,8 @@ set(MBGL_CORE_FILES include/mbgl/util/compression.hpp include/mbgl/util/constants.hpp include/mbgl/util/convert.hpp - include/mbgl/util/default_styles.hpp include/mbgl/util/enum.hpp + include/mbgl/util/event.hpp include/mbgl/util/exception.hpp include/mbgl/util/feature.hpp include/mbgl/util/font_stack.hpp @@ -415,11 +391,14 @@ set(MBGL_CORE_FILES include/mbgl/util/geojson.hpp include/mbgl/util/geometry.hpp include/mbgl/util/image.hpp + include/mbgl/util/logging.hpp include/mbgl/util/noncopyable.hpp include/mbgl/util/optional.hpp + include/mbgl/util/platform.hpp include/mbgl/util/projection.hpp include/mbgl/util/range.hpp include/mbgl/util/run_loop.hpp + include/mbgl/util/size.hpp include/mbgl/util/string.hpp include/mbgl/util/tileset.hpp include/mbgl/util/timer.hpp @@ -438,9 +417,9 @@ set(MBGL_CORE_FILES src/mbgl/util/compression.cpp src/mbgl/util/constants.cpp src/mbgl/util/convert.cpp - src/mbgl/util/default_styles.cpp src/mbgl/util/dtoa.cpp src/mbgl/util/dtoa.hpp + src/mbgl/util/event.cpp src/mbgl/util/exclusive.hpp src/mbgl/util/font_stack.cpp src/mbgl/util/geo.cpp @@ -451,11 +430,16 @@ set(MBGL_CORE_FILES src/mbgl/util/http_header.hpp src/mbgl/util/http_timeout.cpp src/mbgl/util/http_timeout.hpp + src/mbgl/util/i18n.cpp + src/mbgl/util/i18n.hpp + src/mbgl/util/ignore.hpp + src/mbgl/util/indexed_tuple.hpp src/mbgl/util/interpolate.hpp src/mbgl/util/intersection_tests.cpp src/mbgl/util/intersection_tests.hpp src/mbgl/util/io.cpp src/mbgl/util/io.hpp + src/mbgl/util/logging.cpp src/mbgl/util/mapbox.cpp src/mbgl/util/mapbox.hpp src/mbgl/util/mat2.cpp @@ -464,7 +448,6 @@ set(MBGL_CORE_FILES src/mbgl/util/mat3.hpp src/mbgl/util/mat4.cpp src/mbgl/util/mat4.hpp - src/mbgl/util/math.cpp src/mbgl/util/math.hpp src/mbgl/util/offscreen_texture.cpp src/mbgl/util/offscreen_texture.hpp diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index 56a1335e08..d63bdbc1cf 100644 --- a/cmake/glfw.cmake +++ b/cmake/glfw.cmake @@ -1,12 +1,14 @@ add_executable(mbgl-glfw - bin/glfw.cpp + platform/glfw/main.cpp ) target_sources(mbgl-glfw - PRIVATE include/mbgl/platform/default/glfw_view.hpp - PRIVATE platform/default/glfw_view.cpp - PRIVATE include/mbgl/platform/default/settings_json.hpp - PRIVATE platform/default/settings_json.cpp + PRIVATE platform/glfw/glfw_view.hpp + PRIVATE platform/glfw/glfw_view.cpp + PRIVATE platform/glfw/settings_json.hpp + PRIVATE platform/glfw/settings_json.cpp + PRIVATE platform/default/mbgl/util/default_styles.hpp + PRIVATE platform/default/mbgl/util/default_styles.cpp ) target_compile_options(mbgl-glfw @@ -16,6 +18,7 @@ target_compile_options(mbgl-glfw target_include_directories(mbgl-glfw PRIVATE include PRIVATE src # TODO: eliminate + PRIVATE platform/default ) target_link_libraries(mbgl-glfw diff --git a/cmake/loop-darwin.cmake b/cmake/loop-darwin.cmake index 16bc62537c..7884c80a69 100644 --- a/cmake/loop-darwin.cmake +++ b/cmake/loop-darwin.cmake @@ -4,6 +4,8 @@ add_library(mbgl-loop STATIC platform/darwin/src/timer.cpp ) +set_xcode_property(mbgl-loop GCC_SYMBOLS_PRIVATE_EXTERN YES) + target_compile_options(mbgl-loop PRIVATE -fPIC PRIVATE -fvisibility-inlines-hidden diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index f20f49004c..b2b959e6c1 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -35,6 +35,11 @@ function(create_source_groups target) endforeach() endfunction() +# This little macro lets you set any XCode specific property +macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE) + set_property(TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE}) +endmacro (set_xcode_property) + function(_write_xcconfig_var target var) get_property(result TARGET ${target} PROPERTY INTERFACE_${var} SET) if (result) diff --git a/cmake/node.cmake b/cmake/node.cmake index 8dd95a9419..ea28e86106 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -3,8 +3,8 @@ add_nodejs_module(mbgl-node ) target_sources(mbgl-node - PRIVATE platform/node/src/node_log.hpp - PRIVATE platform/node/src/node_log.cpp + PRIVATE platform/node/src/node_logging.hpp + PRIVATE platform/node/src/node_logging.cpp PRIVATE platform/node/src/node_map.hpp PRIVATE platform/node/src/node_map.cpp PRIVATE platform/node/src/node_request.hpp @@ -29,6 +29,7 @@ target_compile_options(mbgl-node target_include_directories(mbgl-node PRIVATE src # TODO: eliminate + PRIVATE platform/default ) target_link_libraries(mbgl-node diff --git a/cmake/offline.cmake b/cmake/offline.cmake index 1dc67f7887..23824e6bdf 100644 --- a/cmake/offline.cmake +++ b/cmake/offline.cmake @@ -2,6 +2,11 @@ add_executable(mbgl-offline bin/offline.cpp ) +target_sources(mbgl-offline + PRIVATE platform/default/mbgl/util/default_styles.hpp + PRIVATE platform/default/mbgl/util/default_styles.cpp +) + target_compile_options(mbgl-offline PRIVATE -fvisibility-inlines-hidden ) @@ -9,6 +14,7 @@ target_compile_options(mbgl-offline target_include_directories(mbgl-offline PRIVATE include PRIVATE src # TODO: eliminate + PRIVATE platform/default ) target_link_libraries(mbgl-offline diff --git a/cmake/render.cmake b/cmake/render.cmake index f1b09b3c47..395a106642 100644 --- a/cmake/render.cmake +++ b/cmake/render.cmake @@ -9,6 +9,7 @@ target_compile_options(mbgl-render target_include_directories(mbgl-render PRIVATE include PRIVATE src # TODO: eliminate + PRIVATE platform/default ) target_link_libraries(mbgl-render diff --git a/cmake/shaders.cmake b/cmake/shaders.cmake index bebf476bbf..833ebec862 100644 --- a/cmake/shaders.cmake +++ b/cmake/shaders.cmake @@ -1,17 +1,19 @@ function(add_shader VAR name) set(shader_build_cmd ${NodeJS_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/build-shaders.js) - set(shader_file_prefix ${CMAKE_SOURCE_DIR}/node_modules/mapbox-gl-shaders/src) + set(shader_file_prefix ${CMAKE_SOURCE_DIR}/node_modules/mapbox-gl/shaders) set(shader_source_prefix ${MBGL_GENERATED}/include/mbgl/shader) add_custom_command( - OUTPUT ${shader_source_prefix}/${name}.vertex.hpp ${shader_source_prefix}/${name}.fragment.hpp - COMMAND ${shader_build_cmd} ${shader_file_prefix}/${name}.vertex.glsl ${shader_source_prefix}/${name}.vertex.hpp - COMMAND ${shader_build_cmd} ${shader_file_prefix}/${name}.fragment.glsl ${shader_source_prefix}/${name}.fragment.hpp + OUTPUT ${shader_source_prefix}/${name}.hpp + COMMAND ${shader_build_cmd} ${name} ${shader_file_prefix} ${shader_source_prefix} + DEPENDS ${CMAKE_SOURCE_DIR}/scripts/build-shaders.js DEPENDS ${shader_file_prefix}/${name}.vertex.glsl DEPENDS ${shader_file_prefix}/${name}.fragment.glsl + DEPENDS ${shader_file_prefix}/_prelude.vertex.glsl + DEPENDS ${shader_file_prefix}/_prelude.fragment.glsl VERBATIM ) - set(${VAR} ${${VAR}} ${shader_source_prefix}/${name}.vertex.hpp ${shader_source_prefix}/${name}.fragment.hpp PARENT_SCOPE) + set(${VAR} ${${VAR}} ${shader_source_prefix}/${name}.hpp PARENT_SCOPE) endfunction() add_shader(MBGL_SHADER_FILES circle) diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 598e018224..7d8dc82756 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -23,6 +23,7 @@ set(MBGL_TEST_FILES test/geometry/binpack.test.cpp # gl + test/gl/bucket.test.cpp test/gl/object.test.cpp # include/mbgl @@ -111,5 +112,6 @@ set(MBGL_TEST_FILES test/util/tile_cover.test.cpp test/util/timer.test.cpp test/util/token.test.cpp + test/util/url.test.cpp test/util/work_queue.test.cpp ) diff --git a/cmake/test.cmake b/cmake/test.cmake index c4d9dd9fad..fc7a22874c 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -14,14 +14,9 @@ target_include_directories(mbgl-test PRIVATE test/include PRIVATE test/src PRIVATE platform/default + PRIVATE ${MBGL_GENERATED}/include ) -if(DEFINED ENV{CI}) - target_compile_definitions(mbgl-test - PRIVATE -DCI_BUILD=1 - ) -endif() - target_link_libraries(mbgl-test PRIVATE mbgl-core ) |