~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to src/platforms/mesa/client/CMakeLists.txt

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
include_directories(${client_common_include_dirs})
 
2
 
1
3
include_directories(
2
4
    ${DRM_INCLUDE_DIRS}
3
5
    ${EGL_INCLUDE_DIRS}
18
20
  mirclientplatformmesa MODULE
19
21
 
20
22
  $<TARGET_OBJECTS:mirclientplatformmesaobjects>
21
 
  $<TARGET_OBJECTS:mirclient_platformimpl>
 
23
  $<TARGET_OBJECTS:client_platform_common>
22
24
)
23
25
 
24
26
set_target_properties(