git.iko.soy/unity8
on xenial help sign in
merge prerequisite branch
d033810Michael Zanetti
plugins/Unity/Launcher/CMakeLists.txt+4−6
compare with xenial
unifiedsplit
@@ -1,22 +1,20 @@
1# Dependencies
1# Dependencies
2include(FindPkgConfig)
2include(FindPkgConfig)
3−pkg_check_modules(LIBUNITY_API REQUIRED libunity-api)
3+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher)
4
4
5include_directories(
5include_directories(
6 ${CMAKE_CURRENT_SOURCE_DIR}
6 ${CMAKE_CURRENT_SOURCE_DIR}
7 ${CMAKE_CURRENT_BINARY_DIR}
7 ${CMAKE_CURRENT_BINARY_DIR}
8− ${LIBUNITY_API_INCLUDEDIR}
8+ ${LAUNCHER_API_INCLUDEDIR}
9)
9)
10
10
11−message(found ${LIBUNITY_API_INCLUDEDIR})
12−
13set(QMLLAUNCHERPLUGIN_SRC
11set(QMLLAUNCHERPLUGIN_SRC
14 plugin.cpp
12 plugin.cpp
15 launchermodel.cpp
13 launchermodel.cpp
16 launcheritem.cpp
14 launcheritem.cpp
17− ${LIBUNITY_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
18− ${LIBUNITY_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
19 backend/launcherbackend.cpp
15 backend/launcherbackend.cpp
16+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
17+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
20 )
18 )
21
19
22add_library(UnityLauncher-qml MODULE
20add_library(UnityLauncher-qml MODULE
tests/mocks/Unity/Launcher/CMakeLists.txt+4−5
@@ -4,17 +4,16 @@ include(FindPkgConfig)
4find_package(Qt5Core REQUIRED)
4find_package(Qt5Core REQUIRED)
5find_package(Qt5Quick REQUIRED)
5find_package(Qt5Quick REQUIRED)
6
6
7−#TODO: fix this once unity-api is released to distro
7+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher)
8−set(UNITY_API_DIR /home/mzanetti/Development/unity-api/include/)
9
8
10include_directories(
9include_directories(
11 ${CMAKE_CURRENT_SOURCE_DIR}
10 ${CMAKE_CURRENT_SOURCE_DIR}
12− ${UNITY_API_DIR}
11+ ${LAUNCHER_API_INCLUDEDIR}
13)
12)
14
13
15set(MockLauncherModel_SOURCES
14set(MockLauncherModel_SOURCES
15+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
16− ${UNITY_API_DIR}/unity/shell/launcher/LauncherModelInterface.h
16+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
17− ${UNITY_API_DIR}/unity/shell/launcher/LauncherItemInterface.h
18 plugin.cpp
17 plugin.cpp
19 MockLauncherModel.cpp
18 MockLauncherModel.cpp
20 MockLauncherItem.cpp
19 MockLauncherItem.cpp