git.iko.soy/unity8
on xenial help sign in
move pkgconfig check for launcher api back to plugins
dc764fcMichael Zanetti
CMakeLists.txt−1
compare with xenial
unifiedsplit
@@ -106,7 +106,6 @@ add_executable(${SHELL_APP}
106
106
107qt5_use_modules(${SHELL_APP} Qml Quick Test)
107qt5_use_modules(${SHELL_APP} Qml Quick Test)
108pkg_check_modules(XCB REQUIRED xcb)
108pkg_check_modules(XCB REQUIRED xcb)
109−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)
110
109
111if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
110if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
112 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
111 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
plugins/Unity/Launcher/CMakeLists.txt+3
@@ -1,3 +1,6 @@
1+include(FindPkgConfig)
2+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)
3+
1include_directories(
4include_directories(
2 ${CMAKE_CURRENT_SOURCE_DIR}
5 ${CMAKE_CURRENT_SOURCE_DIR}
3)
6)
tests/mocks/Unity/Launcher/CMakeLists.txt+3
@@ -1,3 +1,6 @@
1+include(FindPkgConfig)
2+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)
3+
1include_directories(
4include_directories(
2 ${CMAKE_CURRENT_SOURCE_DIR}
5 ${CMAKE_CURRENT_SOURCE_DIR}
3)
6)