Mir

Merge lp:~alan-griffiths/mir/optional-mir-egl-examples into lp:mir

  1. optional-mir-egl-examples
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 4295
Proposed branch: lp:~alan-griffiths/mir/optional-mir-egl-examples
Merge into: lp:mir
Diff against target: 347 lines (+105/-180)
3 files modified
CMakeLists.txt (+10/-0)
examples/CMakeLists.txt (+93/-180)
src/utils/CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~alan-griffiths/mir/optional-mir-egl-examples
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Chris Halse Rogers Approve
Review via email: mp+332346@code.launchpad.net

Commit message

Make the building of egl demos optional, and default to off when mesa hasn't been patched

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4293
https://mir-jenkins.ubuntu.com/job/mir-ci/3738/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5136/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5374
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5361
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5361
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5361
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5180/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5180/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5180/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5180/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5180/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5180/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5180/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5180/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3738/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4295
https://mir-jenkins.ubuntu.com/job/mir-ci/3740/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5139/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5377
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5364
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5364
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5364
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5183/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5183/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5183/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5183/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5183/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5183/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5183/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5183/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3740/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Hmm seems to be complaining that theres no mirvanity to install from the debian/mir-utils.install file. Im not to familiar on how to disable those from being installed if its not supported.

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

On Tuesday, 17 October 2017 22:02:52 BST, Brandon Schaefer
<email address hidden> wrote:
> Hmm seems to be complaining that theres no mirvanity to install
> from the debian/mir-utils.install file. Im not to familiar on
> how to disable those from being installed if its not supported.

The problem is that it should be created, not that it shouldn't be
installed. I'll fix in the morning.

--
Alan Griffiths. +44 (0)798 9938 758
Octopull Limited. http://www.octopull.co.uk/

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4297
https://mir-jenkins.ubuntu.com/job/mir-ci/3741/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5141
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5379
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5366
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5366
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5366
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5185
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5185/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5185
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5185/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5185
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5185/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5185
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5185/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5185
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5185/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5185
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5185/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5185
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5185/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5185
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5185/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3741/rebuild

review: Approve (continuous-integration)
Revision history for this message
Chris Halse Rogers (raof) wrote :

LGTM

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1470/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5142/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1606/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5380
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5367
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5367
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5367
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5186/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5186/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5186
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5186/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5186
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5186/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5186
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5186/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5186/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5186
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5186/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5186
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5186/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2017-10-16 12:11:24 +0000
+++ CMakeLists.txt 2017-10-18 08:24:42 +0000
@@ -275,6 +275,16 @@
275 pkg_check_modules(DRM REQUIRED libdrm)275 pkg_check_modules(DRM REQUIRED libdrm)
276endif()276endif()
277277
278# This incantation gets the MIR_EGL_SUPPORTED default right for Mesa
279execute_process(COMMAND grep mir_toolkit /usr/include/EGL/eglplatform.h
280 OUTPUT_VARIABLE MIR_EGL_SUPPORTED_OUT)
281
282if (MIR_EGL_SUPPORTED_OUT STREQUAL "")
283 option(MIR_EGL_SUPPORTED "Build examples that depend on Mir EGL." OFF)
284else()
285 option(MIR_EGL_SUPPORTED "Build examples that depend on Mir EGL." ON)
286endif()
287
278set(MIR_TRACEPOINT_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/mir/tools)288set(MIR_TRACEPOINT_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/mir/tools)
279289
280set(MIR_GENERATED_INCLUDE_DIRECTORIES)290set(MIR_GENERATED_INCLUDE_DIRECTORIES)
281291
=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt 2017-10-16 14:56:31 +0000
+++ examples/CMakeLists.txt 2017-10-18 08:24:42 +0000
@@ -3,10 +3,7 @@
33
4set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -fno-strict-aliasing -Wextra")4set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -fno-strict-aliasing -Wextra")
55
6add_library(eglapp STATIC6add_library(mirdraw STATIC graphics_utils.cpp)
7 eglapp.c
8 client_helpers.cpp
9)
107
11add_library(exampleserverconfig STATIC8add_library(exampleserverconfig STATIC
12 server_example_input_device_config.cpp9 server_example_input_device_config.cpp
@@ -20,150 +17,26 @@
2017
21target_link_libraries(exampleserverconfig mirserver)18target_link_libraries(exampleserverconfig mirserver)
2219
23target_link_libraries(eglapp20mir_add_wrapped_executable(mir_demo_client_basic basic.c)
24 mirclient21target_link_libraries (mir_demo_client_basic mirclient ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
25 ${EGL_LIBRARIES}
26 ${GLESv2_LIBRARIES}
27 )
28
29mir_add_wrapped_executable(mir_demo_client_animated_cursor
30 animated_cursor_demo_client.c
31)
32target_link_libraries(mir_demo_client_animated_cursor
33 eglapp
34)
35mir_add_wrapped_executable(mir_demo_client_eglflash
36 eglflash.c
37)
38target_link_libraries(mir_demo_client_eglflash
39 eglapp
40)
41mir_add_wrapped_executable(mir_demo_client_egltriangle
42 egltriangle.c
43)
44target_link_libraries(mir_demo_client_egltriangle
45 eglapp
46)
47mir_add_wrapped_executable(mir_demo_client_target
48 target.c
49)
50target_link_libraries(mir_demo_client_target
51 eglapp
52)
53mir_add_wrapped_executable(mir_demo_client_pointer_confinement
54 pointer_confinement.c
55)
56target_link_libraries(mir_demo_client_pointer_confinement
57 eglapp
58)
59mir_add_wrapped_executable(mir_demo_client_camera
60 camera.c
61)
62target_link_libraries(mir_demo_client_camera
63 eglapp
64)
65mir_add_wrapped_executable(mir_demo_client_eglcounter
66 eglcounter.cpp
67)
68target_link_libraries(mir_demo_client_eglcounter
69 eglapp
70)
71mir_add_wrapped_executable(mir_demo_client_eglplasma
72 eglplasma.c
73)
74target_link_libraries(mir_demo_client_eglplasma
75 eglapp
76)
77mir_add_wrapped_executable(mir_demo_client_cursors
78 cursors_demo_client.c
79)
80target_link_libraries(mir_demo_client_cursors
81 eglapp
82)
83mir_add_wrapped_executable(mir_demo_client_eglstateswitcher
84 eglstateswitcher.c
85)
86target_link_libraries(mir_demo_client_eglstateswitcher
87 eglapp
88)
89
90mir_add_wrapped_executable(mir_demo_client_tooltip
91 tooltip.c
92)
93target_link_libraries(mir_demo_client_tooltip
94 eglapp
95 )
96
97mir_add_wrapped_executable(mir_demo_client_touch_validator
98 client_touch_validator.cpp
99)
100target_link_libraries(mir_demo_client_touch_validator
101 eglapp
102)
103
104mir_add_wrapped_executable(mir_demo_client_basic
105 basic.c
106 )
107
108mir_add_wrapped_executable(mir_demo_client_input_shapes
109 input_shapes.cpp
110 )
111target_link_libraries(mir_demo_client_input_shapes eglapp)
112
113target_link_libraries(mir_demo_client_basic
114 mirclient
115
116 ${Boost_LIBRARIES}
117 ${CMAKE_THREAD_LIBS_INIT}
118)
11922
120mir_add_wrapped_executable(mir_demo_client_release_at_exit release_at_exit.c)23mir_add_wrapped_executable(mir_demo_client_release_at_exit release_at_exit.c)
121target_link_libraries(mir_demo_client_release_at_exit mirclient)24target_link_libraries (mir_demo_client_release_at_exit mirclient)
12225
123mir_add_wrapped_executable(mir_demo_client_multiwin multiwin.c)26mir_add_wrapped_executable(mir_demo_client_multiwin multiwin.c)
124target_link_libraries(mir_demo_client_multiwin mirclient)27target_link_libraries (mir_demo_client_multiwin mirclient)
12528
126mir_add_wrapped_executable(mir_demo_client_fingerpaint fingerpaint.c)29mir_add_wrapped_executable(mir_demo_client_fingerpaint fingerpaint.c)
127target_link_libraries(mir_demo_client_fingerpaint mirclient)30target_link_libraries (mir_demo_client_fingerpaint mirclient)
12831
129mir_add_wrapped_executable(mir_demo_client_progressbar progressbar.c)32mir_add_wrapped_executable(mir_demo_client_progressbar progressbar.c)
130target_link_libraries(mir_demo_client_progressbar mirclient)33target_link_libraries (mir_demo_client_progressbar mirclient)
13134
132mir_add_wrapped_executable(mir_demo_client_display_config demo_client_display_config.c)35mir_add_wrapped_executable(mir_demo_client_flicker flicker.c)
133target_link_libraries(mir_demo_client_display_config eglapp)36target_link_libraries (mir_demo_client_flicker mirclient ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
134
135mir_add_wrapped_executable(mir_demo_client_eglsquare eglsquare.cpp)
136target_link_libraries(mir_demo_client_eglsquare eglapp)
137
138if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
139 target_link_libraries(mir_demo_client_eglsquare atomic)
140endif()
141
142mir_add_wrapped_executable(mir_demo_client_flicker
143 flicker.c
144)
145
146target_link_libraries(mir_demo_client_flicker
147 mirclient
148
149 ${Boost_LIBRARIES}
150 ${CMAKE_THREAD_LIBS_INIT}
151)
152
153mir_add_wrapped_executable(mir_demo_client_scroll
154 scroll.cpp
155)
156
157target_link_libraries(mir_demo_client_scroll
158 eglapp
159 mirdraw
160 ${GLESv2_LIBRARIES}
161)
16237
163mir_add_wrapped_executable(mir_demo_client_prompt_session prompt_session.c)38mir_add_wrapped_executable(mir_demo_client_prompt_session prompt_session.c)
164target_link_libraries(mir_demo_client_prompt_session mirclient)39target_link_libraries (mir_demo_client_prompt_session mirclient)
165
166add_library(mirdraw STATIC graphics_utils.cpp)
16740
168include_directories(41include_directories(
169 ${PROJECT_SOURCE_DIR}/include/miral42 ${PROJECT_SOURCE_DIR}/include/miral
@@ -238,51 +111,91 @@
238 endif ()111 endif ()
239endif ()112endif ()
240113
241mir_add_wrapped_executable(mir_demo_client_multistream114mir_add_wrapped_executable(mir_demo_client_prerendered_frames prerendered_frames.c)
242 multi_stream.cpp115target_link_libraries (mir_demo_client_prerendered_frames mirclient m)
243)116
244117mir_add_wrapped_executable(mir_demo_client_chain_jumping_buffers chain_jumping_buffers.c)
245target_link_libraries(mir_demo_client_multistream118target_link_libraries (mir_demo_client_chain_jumping_buffers mirclient)
246 mirclient
247 eglapp
248 ${Boost_LIBRARIES}
249)
250
251mir_add_wrapped_executable(mir_demo_client_render_surface
252 render_surface.cpp
253)
254
255target_link_libraries(mir_demo_client_render_surface
256 mirclient
257 eglapp
258)
259
260mir_add_wrapped_executable(mir_demo_client_prerendered_frames
261 prerendered_frames.c
262)
263
264target_link_libraries(mir_demo_client_prerendered_frames
265 mirclient
266 m
267)
268
269mir_add_wrapped_executable(mir_demo_client_chain_jumping_buffers
270 chain_jumping_buffers.c
271)
272
273target_link_libraries(mir_demo_client_chain_jumping_buffers
274 mirclient
275)
276119
277include_directories(${MIR_GENERATED_INCLUDE_DIRECTORIES})120include_directories(${MIR_GENERATED_INCLUDE_DIRECTORIES})
278121
279mir_add_wrapped_executable(mir_demo_client_wayland wayland_client.c)122mir_add_wrapped_executable(mir_demo_client_wayland wayland_client.c)
280target_link_libraries(mir_demo_client_wayland123target_link_libraries (mir_demo_client_wayland ${WAYLAND_CLIENT_LDFLAGS} ${WAYLAND_CLIENT_LIBRARIES})
281
282 ${WAYLAND_CLIENT_LDFLAGS} ${WAYLAND_CLIENT_LIBRARIES}
283)
284124
285mir_add_wrapped_executable(mir_demo_client_screencast screencast.cpp)125mir_add_wrapped_executable(mir_demo_client_screencast screencast.cpp)
286126target_link_libraries (mir_demo_client_screencast mirclient)
287target_link_libraries(mir_demo_client_screencast mirclient)127
288128
129# The remaining examples are dependent on Mir EGL being supported.
130if (MIR_EGL_SUPPORTED)
131
132 add_library(eglapp STATIC
133 eglapp.c
134 client_helpers.cpp
135 )
136
137 target_link_libraries(eglapp
138 mirclient
139 ${EGL_LIBRARIES}
140 ${GLESv2_LIBRARIES}
141 )
142
143 mir_add_wrapped_executable(mir_demo_client_animated_cursor animated_cursor_demo_client.c)
144 target_link_libraries (mir_demo_client_animated_cursor eglapp)
145
146 mir_add_wrapped_executable(mir_demo_client_eglflash eglflash.c)
147 target_link_libraries (mir_demo_client_eglflash eglapp)
148
149 mir_add_wrapped_executable(mir_demo_client_egltriangle egltriangle.c)
150 target_link_libraries (mir_demo_client_egltriangle eglapp)
151
152 mir_add_wrapped_executable(mir_demo_client_target target.c)
153 target_link_libraries (mir_demo_client_target eglapp)
154
155 mir_add_wrapped_executable(mir_demo_client_pointer_confinement pointer_confinement.c)
156 target_link_libraries (mir_demo_client_pointer_confinement eglapp)
157
158 mir_add_wrapped_executable(mir_demo_client_camera camera.c)
159 target_link_libraries (mir_demo_client_camera eglapp)
160
161 mir_add_wrapped_executable(mir_demo_client_eglcounter eglcounter.cpp)
162 target_link_libraries (mir_demo_client_eglcounter eglapp)
163
164 mir_add_wrapped_executable(mir_demo_client_eglplasma eglplasma.c)
165 target_link_libraries (mir_demo_client_eglplasma eglapp)
166
167 mir_add_wrapped_executable(mir_demo_client_cursors cursors_demo_client.c)
168 target_link_libraries (mir_demo_client_cursors eglapp)
169
170 mir_add_wrapped_executable(mir_demo_client_eglstateswitcher eglstateswitcher.c)
171 target_link_libraries (mir_demo_client_eglstateswitcher eglapp)
172
173 mir_add_wrapped_executable(mir_demo_client_tooltip tooltip.c)
174 target_link_libraries (mir_demo_client_tooltip eglapp)
175
176 mir_add_wrapped_executable(mir_demo_client_touch_validator client_touch_validator.cpp)
177 target_link_libraries (mir_demo_client_touch_validator eglapp)
178
179 mir_add_wrapped_executable(mir_demo_client_display_config demo_client_display_config.c)
180 target_link_libraries (mir_demo_client_display_config eglapp)
181
182 mir_add_wrapped_executable(mir_demo_client_eglsquare eglsquare.cpp)
183 target_link_libraries (mir_demo_client_eglsquare eglapp)
184
185 if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
186 target_link_libraries (mir_demo_client_eglsquare atomic)
187 endif()
188
189 mir_add_wrapped_executable(mir_demo_client_input_shapes input_shapes.cpp)
190 target_link_libraries (mir_demo_client_input_shapes eglapp)
191
192 mir_add_wrapped_executable(mir_demo_client_scroll scroll.cpp)
193 target_link_libraries (mir_demo_client_scroll eglapp mirdraw ${GLESv2_LIBRARIES})
194
195 mir_add_wrapped_executable(mir_demo_client_multistream multi_stream.cpp)
196 target_link_libraries (mir_demo_client_multistream mirclient eglapp ${Boost_LIBRARIES})
197
198 mir_add_wrapped_executable(mir_demo_client_render_surface render_surface.cpp)
199 target_link_libraries (mir_demo_client_render_surface mirclient eglapp)
200
201endif() # MIR_EGL_SUPPORTED
289202
=== modified file 'src/utils/CMakeLists.txt'
--- src/utils/CMakeLists.txt 2017-05-08 03:04:26 +0000
+++ src/utils/CMakeLists.txt 2017-10-18 08:24:42 +0000
@@ -10,9 +10,11 @@
10mir_add_wrapped_executable(mirout out.c)10mir_add_wrapped_executable(mirout out.c)
11target_link_libraries(mirout mirclient m)11target_link_libraries(mirout mirclient m)
1212
13if (MIR_EGL_SUPPORTED)
13mir_add_wrapped_executable(mirvanity vanity.c)14mir_add_wrapped_executable(mirvanity vanity.c)
14target_include_directories(mirvanity PRIVATE ${PROJECT_SOURCE_DIR}/examples)15target_include_directories(mirvanity PRIVATE ${PROJECT_SOURCE_DIR}/examples)
15target_link_libraries(mirvanity eglapp)16target_link_libraries(mirvanity eglapp)
17endif()
1618
17mir_add_wrapped_executable(mirin in.cpp)19mir_add_wrapped_executable(mirin in.cpp)
18target_link_libraries(mirin mirclient)20target_link_libraries(mirin mirclient)

Subscribers

People subscribed via source and target branches