on xenial help sign in
merge upstream
commit53f0da8ab5908d127758e2e4d578b2843c1096a6 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 2 Jul 2013, 14:55 (13 years ago) parent10fc9e5de0ec88
2 files changed+7−7
debian/control+1 plugins/Unity/Launcher/CMakeLists.txt+6−7
debian/control+1
@@ -12,6 +12,7 @@ Build-Depends: cmake,
1212 libhud-client2-dev,
1313 libpulse-dev,
1414 libunity-core-6.0-dev (<< 7.80),
15+ libunity-api-dev,
1516 libxcb1-dev,
1617 pkg-config,
1718 python3,
plugins/Unity/Launcher/CMakeLists.txt+6−7
@@ -1,22 +1,21 @@
11# Dependencies
22include(FindPkgConfig)
3−
4−#TODO: remove this once unity-api is released to distro
5−set(UNITY_API_DIR /home/mzanetti/Development/unity-api/include/)
3+pkg_check_modules(LIBUNITY_API REQUIRED libunity-api)
64
75include_directories(
86 ${CMAKE_CURRENT_SOURCE_DIR}
97 ${CMAKE_CURRENT_BINARY_DIR}
10− ${UNITY_API_DIR}
8+ ${LIBUNITY_API_INCLUDEDIR}
119)
1210
11+message(found ${LIBUNITY_API_INCLUDEDIR})
12+
1313set(QMLLAUNCHERPLUGIN_SRC
1414 plugin.cpp
1515 launchermodel.cpp
1616 launcheritem.cpp
17− ${UNITY_API_DIR}/unity/shell/launcher/LauncherItemInterface.h
18− ${UNITY_API_DIR}/unity/shell/launcher/LauncherModelInterface.h
19− backend/launcherbackend.cpp
17+ ${LIBUNITY_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
18+ ${LIBUNITY_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
2019 )
2120
2221add_library(UnityLauncher-qml MODULE