← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to CMakeLists.txt

Committer: Package Import Robot
Author(s): Alexandros Frantzis
Date: 2015-10-08 16:12:19 UTC
mto: This revision was merged to the branch mainline in revision 109.
Revision ID: package-import@ubuntu.com-20151008161219-emk4a1ys51yy0wjb

Tags: upstream-0.17.0+15.10.20151008.2

Import upstream version 0.17.0+15.10.20151008.2

files added:
3rd_party/android-deps/android/native_window.h

3rd_party/android-deps/android/rect.h

examples/as_render_target.h

include/client/mir_toolkit/events/surface_output_event.h

include/client/mir_toolkit/mir_blob.h

include/common/mir/shared_library.h

include/cookie

include/cookie/mir

include/cookie/mir/cookie_factory.h

include/cookie/mir_toolkit

include/cookie/mir_toolkit/cookie.h

include/renderers/gl/mir/renderer/gl/render_target.h

include/server/mir/input/device.h

include/server/mir/shell/display_configuration_controller.h

include/test/mir/test/doubles/stub_cursor.h

src/client/mir_blob.cpp

src/cookie

src/cookie/CMakeLists.txt

src/cookie/cookie_factory.cpp

src/cookie/mircookie.pc.in

src/cookie/symbols.map

src/gl

src/gl/CMakeLists.txt

src/gl/default_program_factory.cpp

src/gl/program.cpp

src/gl/recently_used_cache.cpp

src/gl/recently_used_cache.h

src/gl/tessellation_helpers.cpp

src/gl/texture.cpp

src/include/gl

src/include/gl/mir

src/include/gl/mir/gl

src/include/gl/mir/gl/default_program_factory.h

src/include/gl/mir/gl/primitive.h

src/include/gl/mir/gl/program.h

src/include/gl/mir/gl/program_factory.h

src/include/gl/mir/gl/tessellation_helpers.h

src/include/gl/mir/gl/texture.h

src/include/gl/mir/gl/texture_cache.h

src/platforms/android/server/display_device_exceptions.h

src/platforms/evdev/libinput_device.cpp

src/platforms/evdev/libinput_device.h

src/platforms/evdev/libinput_device_ptr.cpp

src/platforms/evdev/libinput_device_ptr.h

src/platforms/evdev/libinput_ptr.cpp

src/platforms/evdev/libinput_ptr.h

src/platforms/evdev/platform.cpp

src/platforms/evdev/platform.h

src/platforms/evdev/platform_factory.cpp

src/platforms/input_platform_symbols.map

src/platforms/mesa/mir-client-platform-mesa.pc.in

src/server/frontend/event_sink_factory.h

src/server/frontend/reordering_message_sender.cpp

src/server/frontend/reordering_message_sender.h

src/server/input/default_device.cpp

src/server/input/device_handle.h

src/server/scene/output_properties_cache.cpp

src/server/scene/output_properties_cache.h

tests/acceptance-tests/test_client_scaling.cpp

tests/acceptance-tests/test_mirblob.cpp

tests/acceptance-tests/throwback/test_client_library_errors.cpp

tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp

tests/include/mir/test/as_render_target.h

tests/include/mir/test/doubles/mock_event_sink_factory.h

tests/include/mir/test/doubles/mock_gl_display_buffer.h

tests/include/mir/test/doubles/mock_libinput.h

tests/include/mir/test/doubles/mock_message_sender.h

tests/include/mir/test/doubles/null_event_sink_factory.h

tests/include/mir/test/doubles/null_message_sender.h

tests/include/mir/test/doubles/stub_gl_display_buffer.h

tests/include/mir_test_framework/using_client_platform.h

tests/mir_test_doubles/mock_event_sink_factory.cpp

tests/mir_test_doubles/mock_libinput.cpp

tests/mir_test_doubles/null_event_sink.cpp

tests/mir_test_doubles/null_event_sink_factory.cpp

tests/mir_test_framework/udev_recordings/CMakeLists.txt

tests/mir_test_framework/udev_recordings/laptop-keyboard-hello.evemu

tests/umock-acceptance-tests

tests/umock-acceptance-tests/CMakeLists.txt

tests/umock-acceptance-tests/test_libinput.cpp

tests/unit-tests/frontend/test_buffering_message_sender.cpp

tests/unit-tests/gl

tests/unit-tests/gl/CMakeLists.txt

tests/unit-tests/gl/test_gl_texture_cache.cpp

tests/unit-tests/gl/test_program_factory.cpp

tests/unit-tests/input/evdev/test_evdev_input_platform.cpp

tests/unit-tests/input/evdev/test_libinput_device.cpp

tests/unit-tests/test_mir_cookie.cpp

files removed:
doc/debug_for_xmir.md

src/include/common/mir/shared_library.h

src/include/platform/mir/graphics/gl_primitive.h

src/include/platform/mir/graphics/gl_program.h

src/include/platform/mir/graphics/gl_program_factory.h

src/include/platform/mir/graphics/gl_texture.h

src/include/platform/mir/graphics/gl_texture_cache.h

src/include/platform/mir/graphics/tessellation_helpers.h

src/include/server/mir/compositor/recently_used_cache.h

src/platform/graphics/gl_program.cpp

src/platform/graphics/gl_texture.cpp

src/platform/graphics/tessellation_helpers.cpp

src/platforms/mesa/mir-client-platform-mesa-dev.pc.in

src/server/compositor/recently_used_cache.cpp

src/server/graphics/program_factory.cpp

src/server/graphics/program_factory.h

src/server/input/null_input_targeter.cpp

tests/acceptance-tests/test_client_library_errors.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/include/mir/test/doubles/stub_cursor.h

tests/mir_test_framework/symbols-stub-input.map

tests/unit-tests/compositor/test_gl_texture_cache.cpp

tests/unit-tests/graphics/test_program_factory.cpp

files modified:
CMakeLists.txt

benchmarks/frame-uniformity/touch_producing_server.cpp

benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp

benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h

cmake/ABICheck.cmake

cmake/MirCommon.cmake

doc/building_source_for_pc.md

doc/dso_versioning_guide.md

doc/installing_prebuilt_on_pc.md

doc/mainpage.md

doc/using_mir_on_pc.md

examples/animated_cursor_demo_client.c

examples/render_overlays.cpp

examples/render_to_fb.cpp

examples/server_example_adorning_compositor.cpp

examples/server_example_adorning_compositor.h

examples/server_example_basic_window_manager.h

examples/server_example_canonical_window_manager.cpp

examples/server_example_canonical_window_manager.h

examples/server_example_tiling_window_manager.cpp

examples/server_example_tiling_window_manager.h

examples/server_example_window_management.cpp

include/client/mir/events/event_builders.h

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/events/event.h

include/client/mir_toolkit/mir_buffer_stream.h

include/common/mir/module_deleter.h

include/common/mir_toolkit/common.h

include/platform/mir/graphics/display_buffer.h

include/platform/mir/graphics/display_configuration.h

include/platform/mir/graphics/platform.h

include/platform/mir/input/input_device_info.h

include/platforms/mesa/mir_toolkit/mesa/native_display.h

include/server/mir/compositor/display_listener.h

include/server/mir/frontend/buffer_stream.h

include/server/mir/frontend/session.h

include/server/mir/frontend/session_mediator_report.h

include/server/mir/input/input_device_observer.h

include/server/mir/scene/session.h

include/server/mir/server.h

include/server/mir/shell/abstract_shell.h

include/server/mir/shell/focus_controller.h

include/server/mir/shell/shell.h

include/server/mir/shell/shell_wrapper.h

include/server/mir/shell/window_manager.h

include/test/mir/test/display_config_matchers.h

include/test/mir/test/doubles/null_display_buffer.h

include/test/mir/test/doubles/null_platform.h

include/test/mir/test/doubles/stub_display_configuration.h

include/test/mir/test/doubles/wrap_shell_to_track_latest_surface.h

include/test/mir/test/empty_deleter.h

include/test/mir/test/event_matchers.h

include/test/mir_test_framework/executable_path.h

include/test/mir_test_framework/placement_applying_shell.h

include/test/mir_test_framework/using_stub_client_platform.h

playground/CMakeLists.txt

playground/demo-shell/demo_compositor.cpp

playground/demo-shell/demo_renderer.cpp

playground/demo-shell/demo_renderer.h

src/CMakeLists.txt

src/client/CMakeLists.txt

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/client_buffer_stream.h

src/client/event.cpp

src/client/events/event_builders.cpp

src/client/mir_buffer_stream_api.cpp

src/client/mir_surface_api.cpp

src/client/rpc/mir_display_server.cpp

src/client/rpc/mir_display_server.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/symbols.map

src/common/graphics/android/CMakeLists.txt

src/common/sharedlibrary/module_deleter.cpp

src/common/symbols.map

src/include/common/mir/events/event_private.h

src/include/common/mir/protobuf/display_server.h

src/include/server/mir/compositor/buffer_stream.h

src/include/server/mir/compositor/renderer_factory.h

src/include/server/mir/default_server_configuration.h

src/include/server/mir/frontend/event_sink.h

src/include/server/mir/frontend/fd_sets.h

src/include/server/mir/frontend/shell.h

src/include/server/mir/scene/surface_event_source.h

src/include/server/mir/server_configuration.h

src/platform/graphics/CMakeLists.txt

src/platform/graphics/display_configuration.cpp

src/platform/symbols.map

src/platforms/CMakeLists.txt

src/platforms/android/client/CMakeLists.txt

src/platforms/android/server/CMakeLists.txt

src/platforms/android/server/display.cpp

src/platforms/android/server/display.h

src/platforms/android/server/display_buffer.cpp

src/platforms/android/server/display_buffer.h

src/platforms/android/server/display_group.cpp

src/platforms/android/server/display_group.h

src/platforms/android/server/fb_device.cpp

src/platforms/android/server/hwc_blanking_control.cpp

src/platforms/android/server/hwc_fallback_gl_renderer.cpp

src/platforms/android/server/hwc_fallback_gl_renderer.h

src/platforms/android/server/platform.cpp

src/platforms/android/server/platform.h

src/platforms/android/server/real_hwc_wrapper.cpp

src/platforms/android/server/real_hwc_wrapper.h

src/platforms/android/server/symbols.map

src/platforms/evdev/CMakeLists.txt

src/platforms/evdev/input_modifier_utils.cpp

src/platforms/evdev/input_modifier_utils.h

src/platforms/mesa/CMakeLists.txt

src/platforms/mesa/server/common/gbm_buffer.cpp

src/platforms/mesa/server/kms/display_buffer.cpp

src/platforms/mesa/server/kms/display_buffer.h

src/platforms/mesa/server/kms/guest_platform.cpp

src/platforms/mesa/server/kms/guest_platform.h

src/platforms/mesa/server/kms/platform.cpp

src/platforms/mesa/server/kms/platform.h

src/platforms/mesa/server/kms/real_kms_display_configuration.cpp

src/platforms/mesa/server/kms/symbols.map

src/platforms/mesa/server/x11/graphics/display_buffer.cpp

src/platforms/mesa/server/x11/graphics/display_buffer.h

src/platforms/mesa/server/x11/graphics/display_configuration.cpp

src/platforms/mesa/server/x11/graphics/guest_platform.cpp

src/platforms/mesa/server/x11/graphics/guest_platform.h

src/platforms/mesa/server/x11/graphics/platform.cpp

src/platforms/mesa/server/x11/graphics/platform.h

src/platforms/mesa/server/x11/input/input_platform.cpp

src/platforms/mesa/server/x11/symbols.map

src/protobuf/CMakeLists.txt

src/protobuf/mir_protobuf.proto

src/protobuf/symbols.map

src/renderers/gl/CMakeLists.txt

src/renderers/gl/renderer.cpp

src/renderers/gl/renderer.h

src/renderers/gl/renderer_factory.cpp

src/renderers/gl/renderer_factory.h

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor_factory.cpp

src/server/compositor/multi_monitor_arbiter.cpp

src/server/compositor/multi_monitor_arbiter.h

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/screencast_display_buffer.cpp

src/server/compositor/screencast_display_buffer.h

src/server/compositor/stream.cpp

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/default_ipc_factory.h

src/server/frontend/event_sender.h

src/server/frontend/message_sender.h

src/server/frontend/protobuf_connection_creator.cpp

src/server/frontend/protobuf_ipc_factory.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_responder.h

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/frontend/shell_wrapper.cpp

src/server/frontend/shell_wrapper.h

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/cursor.cpp

src/server/graphics/nested/cursor.h

src/server/graphics/nested/display.cpp

src/server/graphics/nested/display_buffer.cpp

src/server/graphics/nested/display_buffer.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/nested_display_configuration.cpp

src/server/graphics/offscreen/CMakeLists.txt

src/server/graphics/offscreen/display_buffer.cpp

src/server/graphics/offscreen/display_buffer.h

src/server/graphics/offscreen/display_configuration.cpp

src/server/input/CMakeLists.txt

src/server/input/default_configuration.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/input/display_input_region.cpp

src/server/report/logging/session_mediator_report.cpp

src/server/report/logging/session_mediator_report.h

src/server/report/lttng/session_mediator_report.cpp

src/server/report/lttng/session_mediator_report.h

src/server/report/lttng/session_mediator_report_tp.h

src/server/report/null/session_mediator_report.cpp

src/server/report/null/session_mediator_report.h

src/server/scene/CMakeLists.txt

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/default_configuration.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_event_source.cpp

src/server/server.cpp

src/server/shell/CMakeLists.txt

src/server/shell/abstract_shell.cpp

src/server/shell/frontend_shell.cpp

src/server/shell/frontend_shell.h

src/server/shell/shell_wrapper.cpp

src/server/symbols.map

tests/CMakeLists.txt

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_custom_input_dispatcher.cpp

tests/acceptance-tests/test_debug_api.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_input_device_hub.cpp

tests/acceptance-tests/test_nested_input.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_session_mediator_report.cpp

tests/acceptance-tests/test_surface_morphing.cpp

tests/acceptance-tests/test_surface_specification.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/acceptance-tests/test_system_compositor_window_manager.cpp

tests/acceptance-tests/throwback/CMakeLists.txt

tests/acceptance-tests/throwback/test_client_cursor_api.cpp

tests/include/mir/test/doubles/mock_client_buffer_stream.h

tests/include/mir/test/doubles/mock_display_buffer.h

tests/include/mir/test/doubles/mock_nested_context.h

tests/include/mir/test/doubles/mock_scene_session.h

tests/include/mir/test/doubles/mock_shell.h

tests/include/mir/test/doubles/null_event_sink.h

tests/include/mir/test/doubles/stub_display.h

tests/include/mir/test/doubles/stub_display_server.h

tests/include/mir/test/doubles/stub_gbm_native_buffer.h

tests/include/mir/test/doubles/stub_gl_program.h

tests/include/mir/test/doubles/stub_gl_program_factory.h

tests/include/mir/test/doubles/stub_ipc_factory.h

tests/include/mir/test/doubles/stub_scene_session.h

tests/include/mir/test/doubles/stub_surface_factory.h

tests/include/mir/test/stub_server_tool.h

tests/include/mir/test/test_protobuf_client.h

tests/include/mir_test_framework/udev_environment.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_mirsurface.cpp

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/graphics/android/test_android_hardware_sanity.cpp

tests/integration-tests/graphics/mesa/CMakeLists.txt

tests/integration-tests/graphics/mesa/test_buffer_integration.cpp

tests/integration-tests/input/test_cursor_listener.cpp

tests/integration-tests/session_management.cpp

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_stale_frames.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_touchspot_visualization.cpp

tests/mir_test/display_config_matchers.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_doubles/test_protobuf_client.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/executable_path.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/placement_applying_shell.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/mir_test_framework/stubbed_graphics_platform.h

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/mir_test_framework/symbols-server.map

tests/mir_test_framework/testing_server_options.cpp

tests/mir_test_framework/udev_environment.cpp

tests/mir_test_framework/using_stub_client_platform.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_dropping_schedule.cpp

tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/compositor/test_queueing_schedule.cpp

tests/unit-tests/compositor/test_screencast_display_buffer.cpp

tests/unit-tests/dispatch/test_readable_fd.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_event_sender.cpp

tests/unit-tests/frontend/test_protobuf_message_processor.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/android/test_display.cpp

tests/unit-tests/graphics/android/test_display_group.cpp

tests/unit-tests/graphics/android/test_display_hotplug.cpp

tests/unit-tests/graphics/android/test_hwc_fallback_gl_renderer.cpp

tests/unit-tests/graphics/mesa/kms/test_cursor.cpp

tests/unit-tests/graphics/mesa/kms/test_display.cpp

tests/unit-tests/graphics/mesa/kms/test_display_buffer.cpp

tests/unit-tests/graphics/mesa/kms/test_display_configuration.cpp

tests/unit-tests/graphics/mesa/kms/test_display_multi_monitor.cpp

tests/unit-tests/graphics/mesa/x11/test_display.cpp

tests/unit-tests/graphics/mesa/x11/test_platform.cpp

tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/graphics/test_display_configuration.cpp

tests/unit-tests/graphics/test_overlapping_output_grouping.cpp

tests/unit-tests/input/evdev/CMakeLists.txt

tests/unit-tests/input/evdev/test_evdev_device_detection.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_display_input_region.cpp

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/input/test_x11_platform.cpp

tests/unit-tests/input/test_xcursor_loader.cpp

tests/unit-tests/renderers/gl/test_gl_renderer.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/test_module_deleter.cpp

tools/run_abi_compliance_checker.sh

tools/update_package_abis.sh

Show diffs side-by-side

added added

removed removed

27

27

set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

28

28

29

29

set(MIR_VERSION_MAJOR 0)

30

set(MIR_VERSION_MINOR 16) # This should change at least with every MIRSERVER_ABI

30

set(MIR_VERSION_MINOR 17)

31

31

set(MIR_VERSION_PATCH 0)

32

32

33

33

add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})

175

175

find_package(LTTngUST REQUIRED)

176

176

pkg_check_modules(UDEV REQUIRED libudev)

177

177

pkg_check_modules(GLIB REQUIRED glib-2.0)

178

pkg_check_modules(LIBINPUT REQUIRED libinput)

179

pkg_check_modules(NETTLE REQUIRED nettle)

178

180

pkg_check_modules(UUID REQUIRED uuid)

179

181

180

182

include_directories (${GLESv2_INCLUDE_DIRS})

243

245

add_custom_target(ptest

244

246

COMMAND "${CMAKE_SOURCE_DIR}/tools/run_ctests.sh" "--cost-file" "${CMAKE_BINARY_DIR}/ptest_ctest_cost_data.txt" "sh ${CMAKE_BINARY_DIR}/discover_all_tests.sh" "--" "$$ARGS"

245

247

)

248

249

add_custom_target(release-checks)

250

251

mir_check_no_unreleased_symbols(mirclient release-checks)

252

mir_check_no_unreleased_symbols(mircookie release-checks)

253

mir_check_no_unreleased_symbols(mirplatform release-checks)

254

mir_check_no_unreleased_symbols(mirprotobuf release-checks)

255

mir_check_no_unreleased_symbols(mirserver release-checks)

Older »