← Back to branch summary

~alan-griffiths/qtmir/introducing-QtmirWindowManagementPolicy

~alan-griffiths/qtmir/introducing-QtmirWindowManagementPolicy

« back to all changes in this revision

Viewing changes to CMakeLists.txt

Committer: Alan Griffiths
Date: 2016-01-18 17:07:43 UTC
mfrom: (418.1.2 qtmir)
Revision ID: alan@octopull.co.uk-20160118170743-r92e01bmtdqclb3k

merge lp:~alan-griffiths/qtmir/import-WindowManagement-code-from-Mir-examples

files added:
src/platforms/mirserver/mircursorimages.cpp

src/platforms/mirserver/mircursorimages.h

src/platforms/mirserver/namedcursor.h

files modified:
CMakeLists.txt

debian/changelog

debian/control

src/common/debughelpers.cpp

src/common/debughelpers.h

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application.h

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/modules/Unity/Application/session_interface.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/cursor.cpp

src/platforms/mirserver/cursor.h

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/sessionauthorizer.cpp

src/platforms/mirserver/sessionauthorizer.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

src/platforms/mirserver/wm-wip/server_example_basic_window_manager.cpp

src/platforms/mirserver/wm-wip/server_example_basic_window_manager.h

src/platforms/mirserver/wm-wip/server_example_canonical_window_manager.cpp

src/platforms/mirserver/wm-wip/server_example_canonical_window_manager.h

src/platforms/mirserver/wm-wip/server_example_tiling_window_manager.cpp

src/platforms/mirserver/wm-wip/server_example_window_management.cpp

src/platforms/mirserver/wm-wip/server_example_window_management_info.cpp

src/platforms/mirserver/wm-wip/server_example_window_management_info.h

tests/common/mock_display_configuration.h

tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h

tests/mirserver/ScreenController/stub_display.h

tests/mirserver/WindowManager/stub_session.cpp

tests/mirserver/WindowManager/stub_session.h

tests/mirserver/WindowManager/window_manager.cpp

tests/modules/Application/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SurfaceManager/mirsurface_test.cpp

tests/modules/SurfaceManager/mirsurfaceitem_test.cpp

tests/modules/common/fake_mirsurface.h

tests/modules/common/fake_session.h

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_session.h

tests/modules/common/qtmir_test.cpp

tests/modules/common/qtmir_test.h

Show diffs side-by-side

added added

removed removed

75

75

pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

76

76

pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)

77

77

pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)

78

pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=10)

78

pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=12)

79

79

80

80

include_directories(${APPLICATION_API_INCLUDE_DIRS})

81

81

Older »