~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to src/common/CMakeLists.txt

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
list(APPEND MIR_COMMON_SOURCES
23
23
  $<TARGET_OBJECTS:mirtime>
24
24
  ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
25
 
)
 
25
  )
 
26
add_subdirectory(events)
26
27
 
27
28
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
28
29
set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")