← Back to branch summary

~ci-train-bot/mir/mir-ubuntu-artful-2983

« back to all changes in this revision

Viewing changes to src/common/CMakeLists.txt

Merge latest trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common/CMakeLists.txt
39
39
set(MIRCOMMON_ABI 6)
40
40
set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
41
41
 
42
 
mir_add_library_with_symbols(mircommon SHARED
43
 
  ${symbol_map}
 
42
add_library(mircommon SHARED
44
43
  ${MIR_COMMON_SOURCES}
45
44
)
46
45
 
53
52
  PROPERTIES
54
53
  SOVERSION ${MIRCOMMON_ABI}
55
54
  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${symbol_map}"
 
55
  LINK_DEPENDS ${symbol_map}
56
56
)
57
57
 
58
58
install(TARGETS mircommon LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
61
61
  DIRECTORY ${CMAKE_SOURCE_DIR}/include/common/mir ${CMAKE_SOURCE_DIR}/include/common/mir_toolkit
62
62
  DESTINATION "include/mircommon"
63
63
)
64
 
 
65
 
set(MIR_COMMON_OBJECTS ${MIR_COMMON_SOURCES} PARENT_SCOPE)
66
 
set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)