git.iko.soy/unity8
on xenial help sign in
merge prerequisite branch
commitd03381048c664f9441f0c02dd7964fe02b88889b authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 3 Jul 2013, 11:32 (13 years ago) parentcff11abd146c55
2 files changed+8−11
compare with xenial
unifiedsplit
plugins/Unity/Launcher/CMakeLists.txt+4−6 tests/mocks/Unity/Launcher/CMakeLists.txt+4−5
plugins/Unity/Launcher/CMakeLists.txt+4−6
@@ -1,22 +1,20 @@
11# Dependencies
22include(FindPkgConfig)
3−pkg_check_modules(LIBUNITY_API REQUIRED libunity-api)
3+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher)
44
55include_directories(
66 ${CMAKE_CURRENT_SOURCE_DIR}
77 ${CMAKE_CURRENT_BINARY_DIR}
8− ${LIBUNITY_API_INCLUDEDIR}
8+ ${LAUNCHER_API_INCLUDEDIR}
99)
1010
11−message(found ${LIBUNITY_API_INCLUDEDIR})
12−
1311set(QMLLAUNCHERPLUGIN_SRC
1412 plugin.cpp
1513 launchermodel.cpp
1614 launcheritem.cpp
17− ${LIBUNITY_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
18− ${LIBUNITY_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
1915 backend/launcherbackend.cpp
16+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
17+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
2018 )
2119
2220add_library(UnityLauncher-qml MODULE
tests/mocks/Unity/Launcher/CMakeLists.txt+4−5
@@ -4,17 +4,16 @@ include(FindPkgConfig)
44find_package(Qt5Core REQUIRED)
55find_package(Qt5Quick REQUIRED)
66
7−#TODO: fix this once unity-api is released to distro
8−set(UNITY_API_DIR /home/mzanetti/Development/unity-api/include/)
7+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher)
98
109include_directories(
1110 ${CMAKE_CURRENT_SOURCE_DIR}
12− ${UNITY_API_DIR}
11+ ${LAUNCHER_API_INCLUDEDIR}
1312)
1413
1514set(MockLauncherModel_SOURCES
16− ${UNITY_API_DIR}/unity/shell/launcher/LauncherModelInterface.h
17− ${UNITY_API_DIR}/unity/shell/launcher/LauncherItemInterface.h
15+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
16+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
1817 plugin.cpp
1918 MockLauncherModel.cpp
2019 MockLauncherItem.cpp