git.iko.soy/unity8
on xenial help sign in
Fixed up some indicators cmake deps
79e5c53Nick Dedekind
modules/Unity/Indicators/CMakeLists.txt−3
compare with xenial
unifiedsplit
@@ -1,6 +1,5 @@
1project(IndicatorsQml)
1project(IndicatorsQml)
2
2
3−pkg_check_modules(GLIB glib-2.0>=2.32)
4pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
3pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
5find_package(Qt5Core REQUIRED)
4find_package(Qt5Core REQUIRED)
6find_package(Qt5Quick REQUIRED)
5find_package(Qt5Quick REQUIRED)
@@ -12,7 +11,6 @@ add_subdirectory(Network)
12include_directories(
11include_directories(
13 ${CMAKE_CURRENT_SOURCE_DIR}
12 ${CMAKE_CURRENT_SOURCE_DIR}
14 ${CMAKE_CURRENT_BINARY_DIR}
13 ${CMAKE_CURRENT_BINARY_DIR}
15− ${GLIB_INCLUDE_DIRS}
16 ${QMENUMODEL_INCLUDE_DIRS}
14 ${QMENUMODEL_INCLUDE_DIRS}
17)
15)
18
16
@@ -44,7 +42,6 @@ add_library(IndicatorsQml SHARED
44set_target_properties(IndicatorsQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
42set_target_properties(IndicatorsQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
45
43
46target_link_libraries(IndicatorsQml
44target_link_libraries(IndicatorsQml
47− ${GOBJECT_LDFLAGS}
48 ${QMENUMODEL_LDFLAGS}
45 ${QMENUMODEL_LDFLAGS}
49)
46)
50
47
modules/Unity/Indicators/Network/CMakeLists.txt+1−2
@@ -1,5 +1,6 @@
1project(IndicatorsNetworkQml)
1project(IndicatorsNetworkQml)
2
2
3+pkg_check_modules(GLIB glib-2.0>=2.32)
3pkg_check_modules(LIBNM_GLIB libnm-glib>=0.9.6)
4pkg_check_modules(LIBNM_GLIB libnm-glib>=0.9.6)
4pkg_check_modules(LIBNM_UTIL libnm-util>=0.9.6)
5pkg_check_modules(LIBNM_UTIL libnm-util>=0.9.6)
5
6
@@ -21,14 +22,12 @@ if(LIBNM_GLIB_FOUND AND LIBNM_UTIL_FOUND AND GLIB_FOUND)
21 include_directories(
22 include_directories(
22 ${CMAKE_CURRENT_SOURCE_DIR}
23 ${CMAKE_CURRENT_SOURCE_DIR}
23 ${GLIB_INCLUDE_DIRS}
24 ${GLIB_INCLUDE_DIRS}
24− ${QMENUMODEL_INCLUDE_DIRS}
25 ${LIBNM_GLIB_INCLUDE_DIRS}
25 ${LIBNM_GLIB_INCLUDE_DIRS}
26 ${LIBNM_UTIL_INCLUDE_DIRS}
26 ${LIBNM_UTIL_INCLUDE_DIRS}
27 )
27 )
28
28
29 target_link_libraries(IndicatorsNetworkQml
29 target_link_libraries(IndicatorsNetworkQml
30 ${GLIB_LIBRARIES}
30 ${GLIB_LIBRARIES}
31− ${QMENUMODEL_LDFLAGS}
32 ${LIBNM_GLIB_LIBRARIES}
31 ${LIBNM_GLIB_LIBRARIES}
33 ${LIBNM_UTIL_LIBRARIES}
32 ${LIBNM_UTIL_LIBRARIES}
34 )
33 )
tests/qmltests/Panel/tst_IndicatorRow.qml−1
@@ -178,7 +178,6 @@ Item {
178 }
178 }
179
179
180 function test_intial_state() {
180 function test_intial_state() {
181− wait(1000)
182 init_test();
181 init_test();
183
182
184 indicatorRow.state = "initial";
183 indicatorRow.state = "initial";
tests/qmltests/modules/Unity/Indicators/CMakeLists.txt+1−4
@@ -32,10 +32,7 @@ add_library(IndicatorsFakeQml SHARED
32# files directly in targets.
32# files directly in targets.
33set_target_properties(IndicatorsFakeQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
33set_target_properties(IndicatorsFakeQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
34
34
35−target_link_libraries(IndicatorsFakeQml
35+target_link_libraries(IndicatorsFakeQml)
36− ${GOBJECT_LDFLAGS}
37− ${QMENUMODEL_LDFLAGS}
38−)
39
36
40qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
37qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
41
38