← Back to branch summary

~vanvugt/mir/plasma-without-cosine

« back to all changes in this revision

Viewing changes to src/common/CMakeLists.txt

  • Committer: Daniel van Vugt
  • Date: 2015-03-20 09:24:14 UTC
  • Revision ID: daniel.van.vugt@canonical.com-20150320092414-6gridyvsk8cgvjhp
Revert the revert. Back to r2408.

LP: #1434430 was a bug in my test branch. And fixing LP: #1434422 is less
important than LP: #1415321.

Fixes: LP: #1415321
Un-fixes: LP: #1434422
Invalid: LP: #1434430

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common/CMakeLists.txt
10
10
 
11
11
add_subdirectory(fd)
12
12
add_subdirectory(geometry)
13
 
add_subdirectory(input)
14
13
add_subdirectory(logging)
15
14
add_subdirectory(report/lttng)
16
15
add_subdirectory(env)
18
17
add_subdirectory(thread)
19
18
add_subdirectory(time)
20
19
add_subdirectory(dispatch)
 
20
add_subdirectory(udev)
21
21
 
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)
27
26
 
28
27
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
29
28
set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
35
34
  ${MIR_GENERATED_INCLUDE_DIRECTORIES}
36
35
  PARENT_SCOPE)
37
36
 
38
 
list(APPEND MIR_COMMON_SOURCES
39
 
  ${CMAKE_CURRENT_SOURCE_DIR}/event.cpp
40
 
)
41
 
 
42
37
add_library(mircommon
43
38
  SHARED
44
39
  ${MIR_COMMON_SOURCES}
49
44
)
50
45
 
51
46
# TODO we need a place to manage ABI and related versioning but use this as placeholder
52
 
set(MIRCOMMON_ABI 3)
 
47
set(MIRCOMMON_ABI 4)
53
48
set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
54
49
 
55
50
set_target_properties(mircommon