git.iko.soy/unity8
on xenial help sign in
merge upstream
53f0da8Michael Zanetti
debian/control+1
compare with xenial
unifiedsplit
@@ -12,6 +12,7 @@ Build-Depends: cmake,
12 libhud-client2-dev,
12 libhud-client2-dev,
13 libpulse-dev,
13 libpulse-dev,
14 libunity-core-6.0-dev (<< 7.80),
14 libunity-core-6.0-dev (<< 7.80),
15+ libunity-api-dev,
15 libxcb1-dev,
16 libxcb1-dev,
16 pkg-config,
17 pkg-config,
17 python3,
18 python3,
plugins/Unity/Launcher/CMakeLists.txt+6−7
@@ -1,22 +1,21 @@
1# Dependencies
1# Dependencies
2include(FindPkgConfig)
2include(FindPkgConfig)
3−
3+pkg_check_modules(LIBUNITY_API REQUIRED libunity-api)
4−#TODO: remove this once unity-api is released to distro
5−set(UNITY_API_DIR /home/mzanetti/Development/unity-api/include/)
6
4
7include_directories(
5include_directories(
8 ${CMAKE_CURRENT_SOURCE_DIR}
6 ${CMAKE_CURRENT_SOURCE_DIR}
9 ${CMAKE_CURRENT_BINARY_DIR}
7 ${CMAKE_CURRENT_BINARY_DIR}
10− ${UNITY_API_DIR}
8+ ${LIBUNITY_API_INCLUDEDIR}
11)
9)
12
10
11+message(found ${LIBUNITY_API_INCLUDEDIR})
12+
13set(QMLLAUNCHERPLUGIN_SRC
13set(QMLLAUNCHERPLUGIN_SRC
14 plugin.cpp
14 plugin.cpp
15 launchermodel.cpp
15 launchermodel.cpp
16 launcheritem.cpp
16 launcheritem.cpp
17− ${UNITY_API_DIR}/unity/shell/launcher/LauncherItemInterface.h
17+ ${LIBUNITY_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
18− ${UNITY_API_DIR}/unity/shell/launcher/LauncherModelInterface.h
18+ ${LIBUNITY_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
19− backend/launcherbackend.cpp
20 )
19 )
21
20
22add_library(UnityLauncher-qml MODULE
21add_library(UnityLauncher-qml MODULE