← Back to branch summary

~aacid/qtmir/make_sure_surface_not_null

~aacid/qtmir/make_sure_surface_not_null

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/miral/CMakeLists.txt

Committer: Albert Astals Cid
Date: 2017-03-20 16:19:42 UTC
mfrom: (616.1.5 fix-prompt-session-crash-flattened)
Revision ID: albert.astals@canonical.com-20170320161942-ke0izmptc46psqcq

Merge

files added:
src/modules/Unity/Application/sessionmap_interface.h

tests/framework/mock_sessionmap.h

files renamed:
src/platforms/mirserver/mirbuffer.cpp => src/platforms/mirserver/miral/mirbuffer.cpp

src/platforms/mirserver/mirbuffer.h => src/platforms/mirserver/miral/mirbuffer.h

files modified:
src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

src/modules/Unity/Application/mirbuffersgtexture.h

src/modules/Unity/Application/surfacemanager.cpp

src/modules/Unity/Application/surfacemanager.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/miral/CMakeLists.txt

tests/framework/CMakeLists.txt

tests/modules/CMakeLists.txt

tests/modules/SurfaceManager/surface_manager_test.cpp

Show diffs side-by-side

added added

removed removed

src/platforms/mirserver/miral/CMakeLists.txt

1

include_directories(SYSTEM ${MIRSERVER_INCLUDE_DIRS})

1

include_directories(SYSTEM ${MIRSERVER_INCLUDE_DIRS} ${MIRRENDERERGLDEV_INCLUDE_DIRS})

2

2

3

3

add_library(miral-prototypes OBJECT

4

4

edid.cpp edid.h

5

5

persist_display_config.cpp persist_display_config.h

6

mirbuffer.cpp mirbuffer.h

6

7

)

Older »