git.iko.soy/unity8
on xenial help sign in
Add unity-mir dep
commitceffce7e3d16c2fd61c44c17a0eff3099018f3a5 authorRicardo Mendoza <ricardo.mendoza@canonical.com> dateFri 6 Sep 2013, 06:33 (13 years ago) parentc0e2979
2 files changed+6
compare with xenial
unifiedsplit
CMakeLists.txt+4 debian/control+2
CMakeLists.txt+4
@@ -62,10 +62,13 @@ set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
6262
6363configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
6464
65+pkg_check_modules(UNITY-MIR REQUIRED unity-mir)
66+
6567include_directories(
6668 ${CMAKE_CURRENT_BINARY_DIR}
6769 ${CMAKE_CURRENT_SOURCE_DIR}
6870 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
71+ ${UNITY-MIR_INCLUDE_DIRS}
6972 )
7073
7174set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
@@ -118,6 +121,7 @@ target_link_libraries(${SHELL_APP}
118121 ${Qt5Qml_LIBRARIES}
119122 ${Qt5Quick_LIBRARIES}
120123 ${XCB_LDFLAGS}
124+ ${UNITY-MIR_LDFLAGS}
121125 )
122126
123127# install binaries
debian/control+2
@@ -23,6 +23,7 @@ Build-Depends: cmake,
2323 libunity-api-dev (>= 7.80.3),
2424 libunity-core-6.0-dev (<< 7.80),
2525 libunity-dev (>= 7.0.12),
26+ libunity-mir-dev,
2627 libunity-scopes-json-def-phone,
2728 libupstart-dev,
2829 libusermetricsoutput1-dev,
@@ -65,6 +66,7 @@ Package: unity8
6566Architecture: any
6667Provides: indicator-renderer,
6768Depends: gsettings-desktop-schemas,
69+ libunity-mir1,
6870 qmenumodel-qml (>= 0.2.7),
6971 qtdeclarative5-dee-plugin,
7072 qtdeclarative5-gsettings1.0,