git.iko.soy/unity8
on xenial help sign in
Move the pkg check deeper down the stack
960f4f0Ted Gould
CMakeLists.txt−1
compare with xenial
unifiedsplit
@@ -108,7 +108,6 @@ add_executable(${SHELL_APP}
108
108
109qt5_use_modules(${SHELL_APP} Qml Quick Test)
109qt5_use_modules(${SHELL_APP} Qml Quick Test)
110pkg_check_modules(XCB REQUIRED xcb)
110pkg_check_modules(XCB REQUIRED xcb)
111−pkg_check_modules(LIBUPSTART libupstart libnih libnih-dbus dbus-1)
112
111
113if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
112if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
114 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
113 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
plugins/Unity/Indicators/CMakeLists.txt+4
@@ -4,6 +4,8 @@ include(Plugins)
4project(IndicatorsQml)
4project(IndicatorsQml)
5
5
6pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
6pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
7+pkg_check_modules(LIBUPSTART REQUIRED libupstart libnih libnih-dbus dbus-1)
8+
7find_package(Qt5Core REQUIRED)
9find_package(Qt5Core REQUIRED)
8find_package(Qt5Quick REQUIRED)
10find_package(Qt5Quick REQUIRED)
9
11
@@ -15,6 +17,7 @@ include_directories(
15 ${CMAKE_CURRENT_SOURCE_DIR}
17 ${CMAKE_CURRENT_SOURCE_DIR}
16 ${CMAKE_CURRENT_BINARY_DIR}
18 ${CMAKE_CURRENT_BINARY_DIR}
17 ${QMENUMODEL_INCLUDE_DIRS}
19 ${QMENUMODEL_INCLUDE_DIRS}
20+ ${LIBUPSTART_INCLUDE_DIRS}
18)
21)
19
22
20set(IndicatorsQML_SOURCES
23set(IndicatorsQML_SOURCES
@@ -44,6 +47,7 @@ add_library(IndicatorsQml SHARED
44
47
45target_link_libraries(IndicatorsQml
48target_link_libraries(IndicatorsQml
46 ${QMENUMODEL_LDFLAGS}
49 ${QMENUMODEL_LDFLAGS}
50+ ${LIBUPSTART_LIBRARIES}
47)
51)
48
52
49qt5_use_modules(IndicatorsQml Core Qml Quick)
53qt5_use_modules(IndicatorsQml Core Qml Quick)