git.iko.soy/unity8
on xenial help sign in
fix pkgconfig check for right api
commitce999dc3a4c75027ce86b93432603b04bc36c243 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 12 Sep 2013, 14:29 (13 years ago) parentbd77ed6
2 files changed+3−3
compare with xenial
unifiedsplit
plugins/Unity/Launcher/CMakeLists.txt+1−1 tests/plugins/Unity/Launcher/CMakeLists.txt+2−2
plugins/Unity/Launcher/CMakeLists.txt+1−1
@@ -1,6 +1,6 @@
11include(FindPkgConfig)
22pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
3−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-application=1)
3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)
44pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
55
66add_definitions(-DSM_BUSNAME=systemBus)
tests/plugins/Unity/Launcher/CMakeLists.txt+2−2
@@ -1,6 +1,6 @@
11pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
22pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
3−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-application=1)
3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)
44
55include_directories(
66 ${CMAKE_CURRENT_BINARY_DIR}
@@ -46,7 +46,7 @@ add_executable(launchermodeltestExec
4646 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
4747 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
4848 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
49− ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
49+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
5050 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
5151 )
5252target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS} )