← Back to branch summary

~alan-griffiths/mir/migrate-tests-to-miral

« back to all changes in this revision

Viewing changes to playground/CMakeLists.txt

  • Committer: Christopher James Halse Rogers
  • Date: 2017-09-07 05:58:13 UTC
  • mfrom: (4242 development-branch)
  • mto: (4243.1.1 mir3)
  • mto: This revision was merged to the branch mainline in revision 4244.
  • Revision ID: christopher.halse.rogers@canonical.com-20170907055813-4qsg25nirybc8jj3
Merge trunk, resolving conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
playground/CMakeLists.txt
1
 
 
2
1
include_directories(
3
 
  ${PROJECT_SOURCE_DIR}/src/include/server
4
 
  ${PROJECT_SOURCE_DIR}/src/include/platform
5
 
  ${PROJECT_SOURCE_DIR}/src/include/common
6
 
  ${PROJECT_SOURCE_DIR}/src/include/gl
7
 
  ${PROJECT_SOURCE_DIR}/src/include/client
8
 
  ${PROJECT_SOURCE_DIR}/src/renderers
9
2
  ${PROJECT_SOURCE_DIR}/include/client
10
 
  ${PROJECT_SOURCE_DIR}/include/server
11
 
  ${PROJECT_SOURCE_DIR}/include/platform
12
 
  ${PROJECT_SOURCE_DIR}/include/renderer
13
 
  ${PROJECT_SOURCE_DIR}/include/renderers/gl
14
 
  ${PROJECT_SOURCE_DIR}/examples/
15
 
)
16
 
 
17
 
add_library(playgroundserverconfig STATIC
18
 
    server_configuration.cpp
19
 
)
20
 
 
21
 
add_subdirectory(demo-shell/)
22
 
 
23
 
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
 
3
)
24
4
 
25
5
mir_add_wrapped_executable(mir_demo_client_egldiamond_render_surface
26
6
    egldiamond_render_surface.c