git.iko.soy/unity8
on xenial help sign in
include(FindPkgConfig) only once, in the root CMakeLists.txt
0bfe3cbDaniel d'Andrada
plugins/LightDM/CMakeLists.txt−2
compare with xenial
unifiedsplit
@@ -1,5 +1,3 @@
1−# Dependencies
2−include(FindPkgConfig)
3pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
1pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
4# TODO: Once we split out a separate greeter process, uncomment these lines
2# TODO: Once we split out a separate greeter process, uncomment these lines
5#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)
3#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)
plugins/Lights/CMakeLists.txt−2
@@ -1,5 +1,3 @@
1−include(FindPkgConfig)
2−
3pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
1pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
4pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
2pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
5
3
plugins/Powerd/CMakeLists.txt−2
@@ -1,5 +1,3 @@
1−include(FindPkgConfig)
2−
3pkg_search_module(GIO REQUIRED gio-2.0)
1pkg_search_module(GIO REQUIRED gio-2.0)
4
2
5include_directories(
3include_directories(
plugins/Unity/Launcher/CMakeLists.txt−1
@@ -1,4 +1,3 @@
1−include(FindPkgConfig)
2pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=5)
1pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=5)
3pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
2pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
3pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
plugins/Unity/Session/CMakeLists.txt−2
@@ -1,5 +1,3 @@
1−include(FindPkgConfig)
2−
3pkg_search_module(GIO REQUIRED gio-2.0)
1pkg_search_module(GIO REQUIRED gio-2.0)
4
2
5include_directories(
3include_directories(
plugins/Utils/CMakeLists.txt−3
@@ -1,6 +1,3 @@
1−# Dependencies
2−include(FindPkgConfig)
3−
4pkg_search_module(GIO REQUIRED gio-2.0)
1pkg_search_module(GIO REQUIRED gio-2.0)
5
2
6include_directories(
3include_directories(