git.iko.soy/unity8
on xenial help sign in
Add unity-mir dep
ceffce7Ricardo Mendoza
CMakeLists.txt+4
compare with xenial
unifiedsplit
@@ -62,10 +62,13 @@ set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
62
62
63configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
63configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
64
64
65+pkg_check_modules(UNITY-MIR REQUIRED unity-mir)
66+
65include_directories(
67include_directories(
66 ${CMAKE_CURRENT_BINARY_DIR}
68 ${CMAKE_CURRENT_BINARY_DIR}
67 ${CMAKE_CURRENT_SOURCE_DIR}
69 ${CMAKE_CURRENT_SOURCE_DIR}
68 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
70 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
71+ ${UNITY-MIR_INCLUDE_DIRS}
69 )
72 )
70
73
71set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
74set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
@@ -118,6 +121,7 @@ target_link_libraries(${SHELL_APP}
118 ${Qt5Qml_LIBRARIES}
121 ${Qt5Qml_LIBRARIES}
119 ${Qt5Quick_LIBRARIES}
122 ${Qt5Quick_LIBRARIES}
120 ${XCB_LDFLAGS}
123 ${XCB_LDFLAGS}
124+ ${UNITY-MIR_LDFLAGS}
121 )
125 )
122
126
123# install binaries
127# install binaries
debian/control+2
@@ -23,6 +23,7 @@ Build-Depends: cmake,
23 libunity-api-dev (>= 7.80.3),
23 libunity-api-dev (>= 7.80.3),
24 libunity-core-6.0-dev (<< 7.80),
24 libunity-core-6.0-dev (<< 7.80),
25 libunity-dev (>= 7.0.12),
25 libunity-dev (>= 7.0.12),
26+ libunity-mir-dev,
26 libunity-scopes-json-def-phone,
27 libunity-scopes-json-def-phone,
27 libupstart-dev,
28 libupstart-dev,
28 libusermetricsoutput1-dev,
29 libusermetricsoutput1-dev,
@@ -65,6 +66,7 @@ Package: unity8
65Architecture: any
66Architecture: any
66Provides: indicator-renderer,
67Provides: indicator-renderer,
67Depends: gsettings-desktop-schemas,
68Depends: gsettings-desktop-schemas,
69+ libunity-mir1,
68 qmenumodel-qml (>= 0.2.7),
70 qmenumodel-qml (>= 0.2.7),
69 qtdeclarative5-dee-plugin,
71 qtdeclarative5-dee-plugin,
70 qtdeclarative5-gsettings1.0,
72 qtdeclarative5-gsettings1.0,