git.iko.soy/unity8
on xenial help sign in
Move the pkg check deeper down the stack
commit960f4f0751dbe6c55809c813a69833a68185167c authorTed Gould <ted@gould.cx> dateWed 7 Aug 2013, 09:53 (13 years ago) parent9fc5775
2 files changed+4−1
compare with xenial
unifiedsplit
CMakeLists.txt−1 plugins/Unity/Indicators/CMakeLists.txt+4
CMakeLists.txt−1
@@ -108,7 +108,6 @@ add_executable(${SHELL_APP}
108108
109109qt5_use_modules(${SHELL_APP} Qml Quick Test)
110110pkg_check_modules(XCB REQUIRED xcb)
111−pkg_check_modules(LIBUPSTART libupstart libnih libnih-dbus dbus-1)
112111
113112if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
114113 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
plugins/Unity/Indicators/CMakeLists.txt+4
@@ -4,6 +4,8 @@ include(Plugins)
44project(IndicatorsQml)
55
66pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
7+pkg_check_modules(LIBUPSTART REQUIRED libupstart libnih libnih-dbus dbus-1)
8+
79find_package(Qt5Core REQUIRED)
810find_package(Qt5Quick REQUIRED)
911
@@ -15,6 +17,7 @@ include_directories(
1517 ${CMAKE_CURRENT_SOURCE_DIR}
1618 ${CMAKE_CURRENT_BINARY_DIR}
1719 ${QMENUMODEL_INCLUDE_DIRS}
20+ ${LIBUPSTART_INCLUDE_DIRS}
1821)
1922
2023set(IndicatorsQML_SOURCES
@@ -44,6 +47,7 @@ add_library(IndicatorsQml SHARED
4447
4548target_link_libraries(IndicatorsQml
4649 ${QMENUMODEL_LDFLAGS}
50+ ${LIBUPSTART_LIBRARIES}
4751)
4852
4953qt5_use_modules(IndicatorsQml Core Qml Quick)