git.iko.soy/unity8
on xenial help sign in
Fixed up some indicators cmake deps
commit79e5c53681e0cb534cec818c0b8ca33cd8c6e234 authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 3 Jul 2013, 16:39 (13 years ago) parent95deeb9
4 files changed+2−10
compare with xenial
unifiedsplit
modules/Unity/Indicators/CMakeLists.txt−3 modules/Unity/Indicators/Network/CMakeLists.txt+1−2 tests/qmltests/Panel/tst_IndicatorRow.qml−1 tests/qmltests/modules/Unity/Indicators/CMakeLists.txt+1−4
modules/Unity/Indicators/CMakeLists.txt−3
@@ -1,6 +1,5 @@
11project(IndicatorsQml)
22
3−pkg_check_modules(GLIB glib-2.0>=2.32)
43pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
54find_package(Qt5Core REQUIRED)
65find_package(Qt5Quick REQUIRED)
@@ -12,7 +11,6 @@ add_subdirectory(Network)
1211include_directories(
1312 ${CMAKE_CURRENT_SOURCE_DIR}
1413 ${CMAKE_CURRENT_BINARY_DIR}
15− ${GLIB_INCLUDE_DIRS}
1614 ${QMENUMODEL_INCLUDE_DIRS}
1715)
1816
@@ -44,7 +42,6 @@ add_library(IndicatorsQml SHARED
4442set_target_properties(IndicatorsQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
4543
4644target_link_libraries(IndicatorsQml
47− ${GOBJECT_LDFLAGS}
4845 ${QMENUMODEL_LDFLAGS}
4946)
5047
modules/Unity/Indicators/Network/CMakeLists.txt+1−2
@@ -1,5 +1,6 @@
11project(IndicatorsNetworkQml)
22
3+pkg_check_modules(GLIB glib-2.0>=2.32)
34pkg_check_modules(LIBNM_GLIB libnm-glib>=0.9.6)
45pkg_check_modules(LIBNM_UTIL libnm-util>=0.9.6)
56
@@ -21,14 +22,12 @@ if(LIBNM_GLIB_FOUND AND LIBNM_UTIL_FOUND AND GLIB_FOUND)
2122 include_directories(
2223 ${CMAKE_CURRENT_SOURCE_DIR}
2324 ${GLIB_INCLUDE_DIRS}
24− ${QMENUMODEL_INCLUDE_DIRS}
2525 ${LIBNM_GLIB_INCLUDE_DIRS}
2626 ${LIBNM_UTIL_INCLUDE_DIRS}
2727 )
2828
2929 target_link_libraries(IndicatorsNetworkQml
3030 ${GLIB_LIBRARIES}
31− ${QMENUMODEL_LDFLAGS}
3231 ${LIBNM_GLIB_LIBRARIES}
3332 ${LIBNM_UTIL_LIBRARIES}
3433 )
tests/qmltests/Panel/tst_IndicatorRow.qml−1
@@ -178,7 +178,6 @@ Item {
178178 }
179179
180180 function test_intial_state() {
181− wait(1000)
182181 init_test();
183182
184183 indicatorRow.state = "initial";
tests/qmltests/modules/Unity/Indicators/CMakeLists.txt+1−4
@@ -32,10 +32,7 @@ add_library(IndicatorsFakeQml SHARED
3232# files directly in targets.
3333set_target_properties(IndicatorsFakeQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
3434
35−target_link_libraries(IndicatorsFakeQml
36− ${GOBJECT_LDFLAGS}
37− ${QMENUMODEL_LDFLAGS}
38−)
35+target_link_libraries(IndicatorsFakeQml)
3936
4037qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
4138