← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to examples/CMakeLists.txt

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/CMakeLists.txt
17
17
 
18
18
add_library(exampleserverconfig STATIC
19
19
  server_example_canonical_window_manager.cpp
20
 
  server_example_generic_shell.cpp
21
20
  server_example_display_configuration_policy.cpp
22
21
  server_example_input_event_filter.cpp
23
22
  server_example_log_options.cpp
24
23
  server_example_input_filter.cpp
25
 
  server_example_fullscreen_placement_strategy.cpp
26
24
  server_example_host_lifecycle_event.cpp
27
25
  server_example_tiling_window_manager.cpp
28
26
  server_example_window_management.cpp
29
 
  server_example_shell.cpp
 
27
  server_example_custom_compositor.cpp
 
28
  server_example_adorning_compositor.cpp
30
29
)
31
30
 
32
31
target_link_libraries(eglapp
33
32
  mirclient
34
33
  ${EGL_LIBRARIES}
35
34
  ${GLESv2_LIBRARIES}
 
35
  )
 
36
 
 
37
mir_add_wrapped_executable(mir_demo_client_animated_cursor
 
38
  animated_cursor_demo_client.c
 
39
)
 
40
target_link_libraries(mir_demo_client_animated_cursor
 
41
  eglapp
36
42
)
37
43
mir_add_wrapped_executable(mir_demo_client_eglflash
38
44
  eglflash.c
46
52
target_link_libraries(mir_demo_client_egltriangle
47
53
  eglapp
48
54
)
 
55
mir_add_wrapped_executable(mir_demo_client_target
 
56
  target.c
 
57
)
 
58
target_link_libraries(mir_demo_client_target
 
59
  eglapp
 
60
)
49
61
mir_add_wrapped_executable(mir_demo_client_eglcounter
50
62
  eglcounter.cpp
51
63
)
105
117
mir_add_wrapped_executable(mir_demo_client_display_config demo_client_display_config.c)
106
118
target_link_libraries(mir_demo_client_display_config eglapp)
107
119
 
 
120
mir_add_wrapped_executable(mir_demo_client_eglsquare eglsquare.cpp)
 
121
target_link_libraries(mir_demo_client_eglsquare eglapp)
 
122
 
108
123
mir_add_wrapped_executable(mir_demo_client_flicker
109
124
  flicker.c
110
125
)
182
197
    mircommon
183
198
)
184
199
 
185
 
# FIXME: Bug not fixed yet.
186
 
if (MIR_ENABLE_TESTS AND MIR_TEST_CLIENT_ABI)
 
200
if (MIR_ENABLE_TESTS)
187
201
  # Regression tests for LP: #1415321
188
202
 
189
203
  # To see reasons for failure:  ctest -V -R Clients-only-use-client-symbols
190
 
  add_test(NAME Clients-only-use-client-symbols
 
204
  mir_add_test(NAME Clients-only-use-client-symbols
191
205
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
192
206
    COMMAND /bin/sh -c "!(nm -u .mir_demo_client_* mir_demo_client* | grep -v @@MIR_CLIENT | grep 'U mir_')"
193
207
  )
194
208
 
 
209
# We use a slightly weaker version of the test with clang as that generates spurious NEEDED
 
210
if (NOT "${CMAKE_CXX_COMPILER}" MATCHES "clang")
195
211
  # To see reasons for failure:  ctest -V -R Clients-only-use-client-ABI
196
 
  add_test(NAME Clients-only-use-client-ABI
 
212
  mir_add_test(NAME Clients-only-use-client-ABI
197
213
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
198
214
    COMMAND /bin/sh -c "!(objdump -p .mir_demo_client_* mir_demo_client*  | grep NEEDED | grep libmir | grep -v libmirclient)"
199
215
  )
 
216
else()
 
217
  # To see reasons for failure:  ctest -V -R Clients-only-use-client-ABI
 
218
  mir_add_test(NAME Clients-only-use-client-ABI
 
219
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
 
220
    COMMAND /bin/sh -c "!(nm -u .mir_demo_client_* mir_demo_client* | grep -v @@MIR_CLIENT | grep @@MIR_)"
 
221
  )
 
222
endif ()
200
223
endif ()