git.iko.soy/unity8
on xenial help sign in
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) (#69)
87aa395Ivan Semkin
CMakeLists.txt+3
compare with xenial
unifiedsplit
@@ -70,6 +70,9 @@ find_package(Qt5DBus 5.6 REQUIRED)
70find_package(Qt5Concurrent 5.6 REQUIRED)
70find_package(Qt5Concurrent 5.6 REQUIRED)
71find_package(Qt5Sql 5.6 REQUIRED)
71find_package(Qt5Sql 5.6 REQUIRED)
72find_package(Qt5Test 5.6 REQUIRED)
72find_package(Qt5Test 5.6 REQUIRED)
73+find_package(Qt5Svg 5.6 REQUIRED)
74+find_package(Qt5Network 5.6 REQUIRED)
75+find_package(Qt5Xml 5.6 REQUIRED)
73
76
74pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)
77pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=27)
75pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
78pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
plugins/AccountsService/CMakeLists.txt+1−2
@@ -7,9 +7,8 @@ add_library(AccountsService-qml MODULE
7 plugin.cpp
7 plugin.cpp
8 )
8 )
9
9
10−qt5_use_modules(AccountsService-qml DBus Qml)
11−
12target_link_libraries(AccountsService-qml
10target_link_libraries(AccountsService-qml
11+ Qt5::DBus Qt5::Qml
13 ${GLIB_LIBRARIES}
12 ${GLIB_LIBRARIES}
14 )
13 )
15
14
plugins/Cursor/CMakeLists.txt+1−2
@@ -26,8 +26,7 @@ add_library(Cursor-qml SHARED
26target_link_libraries(Cursor-qml
26target_link_libraries(Cursor-qml
27 xcursorloader-static
27 xcursorloader-static
28 ${QT5PLATFORM_SUPPORT_LDFLAGS}
28 ${QT5PLATFORM_SUPPORT_LDFLAGS}
29+ Qt5::Qml Qt5::Quick Qt5::Svg
29)
30)
30
31
31−qt5_use_modules(Cursor-qml Qml Quick Svg)
32−
33add_unity8_plugin(Cursor 1.1 Cursor TARGETS Cursor-qml)
32add_unity8_plugin(Cursor 1.1 Cursor TARGETS Cursor-qml)
plugins/Dash/CMakeLists.txt+1−2
@@ -37,10 +37,9 @@ add_library(Dash-qml MODULE
37target_link_libraries(Dash-qml
37target_link_libraries(Dash-qml
38 ${Qt5Gui_LIBRARIES}
38 ${Qt5Gui_LIBRARIES}
39 ${Qt5Quick_LIBRARIES}
39 ${Qt5Quick_LIBRARIES}
40+ Qt5::Qml Qt5::Quick Qt5::Concurrent
40 )
41 )
41
42
42−qt5_use_modules(Dash-qml Qml Quick Concurrent)
43−
44add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
43add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
45
44
46install(FILES graphics/music_progress_bg.png DESTINATION ${SHELL_INSTALL_QML}/Dash/graphics/)
45install(FILES graphics/music_progress_bg.png DESTINATION ${SHELL_INSTALL_QML}/Dash/graphics/)
plugins/GlobalShortcut/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(globalshortcutplugin_SRCS
5
5
6add_library(GlobalShortcut-qml SHARED ${globalshortcutplugin_SRCS})
6add_library(GlobalShortcut-qml SHARED ${globalshortcutplugin_SRCS})
7
7
8−qt5_use_modules(GlobalShortcut-qml Quick Gui)
8+target_link_libraries(GlobalShortcut-qml Qt5::Quick Qt5::Gui)
9
9
10add_unity8_plugin(GlobalShortcut 1.0 GlobalShortcut TARGETS GlobalShortcut-qml)
10add_unity8_plugin(GlobalShortcut 1.0 GlobalShortcut TARGETS GlobalShortcut-qml)
plugins/Greeter/Unity/Launcher/CMakeLists.txt+1−2
@@ -29,8 +29,7 @@ add_library(UnityLauncherAS-qml MODULE
29target_link_libraries(UnityLauncherAS-qml
29target_link_libraries(UnityLauncherAS-qml
30 unity8-private
30 unity8-private
31 ${GSETTINGS_QT_LDFLAGS}
31 ${GSETTINGS_QT_LDFLAGS}
32+ Qt5::DBus Qt5::Qml Qt5::Gui
32 )
33 )
33
34
34−qt5_use_modules(UnityLauncherAS-qml DBus Qml Gui)
35−
36add_unity8_greeter_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncherAS-qml)
35add_unity8_greeter_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncherAS-qml)
plugins/ImageCache/CMakeLists.txt+1−1
@@ -3,6 +3,6 @@ add_library(ImageCache-qml MODULE
3 plugin.cpp
3 plugin.cpp
4 )
4 )
5
5
6−qt5_use_modules(ImageCache-qml Gui Qml Quick)
6+target_link_libraries(ImageCache-qml Qt5::Gui Qt5::Qml Qt5::Quick)
7
7
8add_unity8_plugin(ImageCache 0.1 ImageCache TARGETS ImageCache-qml)
8add_unity8_plugin(ImageCache 0.1 ImageCache TARGETS ImageCache-qml)
plugins/LightDM/FullLightDM/CMakeLists.txt+1−1
@@ -26,7 +26,7 @@ target_link_libraries(FullLightDM-qml
26 unity8-private
26 unity8-private
27 ${LIBLIGHTDM_LDFLAGS}
27 ${LIBLIGHTDM_LDFLAGS}
28 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
28 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
29+ Qt5::DBus Qt5::Gui Qt5::Qml
29 )
30 )
30
31
31−qt5_use_modules(FullLightDM-qml DBus Gui Qml)
32add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)
32add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)
plugins/LightDM/IntegratedLightDM/CMakeLists.txt+1−1
@@ -25,9 +25,9 @@ target_link_libraries(IntegratedLightDM-qml
25 integratedLightDM
25 integratedLightDM
26 unity8-private
26 unity8-private
27 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
27 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
28+ Qt5::DBus Qt5::Gui Qt5::Qml
28 )
29 )
29
30
30−qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)
31add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)
31add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)
32
32
33add_subdirectory(liblightdm)
33add_subdirectory(liblightdm)
plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt+3−4
@@ -26,22 +26,21 @@ target_link_libraries(integratedLightDM
26 ${GLIB_LIBRARIES}
26 ${GLIB_LIBRARIES}
27 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
27 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
28 -lpam
28 -lpam
29+ Qt5::Concurrent Qt5::DBus Qt5::Gui
29)
30)
30target_link_libraries(integratedLightDMSession
31target_link_libraries(integratedLightDMSession
31 ${GLIB_LIBRARIES}
32 ${GLIB_LIBRARIES}
32 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
33 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
33 -lpam
34 -lpam
35+ Qt5::Concurrent Qt5::DBus Qt5::Gui
34)
36)
35target_link_libraries(MockLightDM-demo-shared
37target_link_libraries(MockLightDM-demo-shared
36 ${GLIB_LIBRARIES}
38 ${GLIB_LIBRARIES}
37 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
39 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
38 -lpam
40 -lpam
41+ Qt5::Concurrent Qt5::DBus Qt5::Gui
39)
42)
40
43
41−qt5_use_modules(integratedLightDM Concurrent DBus Gui)
42−qt5_use_modules(integratedLightDMSession Concurrent DBus Gui)
43−qt5_use_modules(MockLightDM-demo-shared Concurrent DBus Gui)
44−
45set_target_properties(integratedLightDM PROPERTIES
44set_target_properties(integratedLightDM PROPERTIES
46 COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")
45 COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")
47set_target_properties(integratedLightDMSession PROPERTIES
46set_target_properties(integratedLightDMSession PROPERTIES
plugins/Lights/CMakeLists.txt+4−2
@@ -11,7 +11,9 @@ add_library(Lights-qml MODULE
11 Lights.cpp
11 Lights.cpp
12 )
12 )
13
13
14−qt5_use_modules(Lights-qml Qml Gui)
14+target_link_libraries(Lights-qml
15+ Qt5::Qml Qt5::Gui
15−target_link_libraries(Lights-qml ${ANDROID_HARDWARE_LIBRARIES})
16+ ${ANDROID_HARDWARE_LIBRARIES}
17+ )
16
18
17add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)
19add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)
plugins/Powerd/CMakeLists.txt+4−2
@@ -9,7 +9,9 @@ add_library(Powerd-qml MODULE
9 Powerd.cpp
9 Powerd.cpp
10 )
10 )
11
11
12−qt5_use_modules(Powerd-qml DBus Qml)
12+target_link_libraries(Powerd-qml
13+ Qt5::DBus Qt5::Qml
13−target_link_libraries(Powerd-qml ${GIO_LDFLAGS})
14+ ${GIO_LDFLAGS}
15+ )
14
16
15add_unity8_plugin(Powerd 0.1 Powerd TARGETS Powerd-qml)
17add_unity8_plugin(Powerd 0.1 Powerd TARGETS Powerd-qml)
plugins/ScreenshotDirectory/CMakeLists.txt+1−1
@@ -4,6 +4,6 @@ set(PLUGIN_SOURCES
4)
4)
5
5
6add_library(ScreenshotDirectory-qml MODULE ${PLUGIN_SOURCES})
6add_library(ScreenshotDirectory-qml MODULE ${PLUGIN_SOURCES})
7−qt5_use_modules(ScreenshotDirectory-qml Qml Gui Quick)
7+target_link_libraries(ScreenshotDirectory-qml Qt5::Qml Qt5::Gui Qt5::Quick)
8
8
9add_unity8_plugin(ScreenshotDirectory 0.1 ScreenshotDirectory TARGETS ScreenshotDirectory-qml)
9add_unity8_plugin(ScreenshotDirectory 0.1 ScreenshotDirectory TARGETS ScreenshotDirectory-qml)
plugins/SessionBroadcast/CMakeLists.txt+1−2
@@ -6,9 +6,8 @@ add_library(SessionBroadcast-qml MODULE
6 plugin.cpp
6 plugin.cpp
7 )
7 )
8
8
9−qt5_use_modules(SessionBroadcast-qml DBus Qml)
10−
11target_link_libraries(SessionBroadcast-qml
9target_link_libraries(SessionBroadcast-qml
10+ Qt5::DBus Qt5::Qml
12 ${GLIB_LIBRARIES}
11 ${GLIB_LIBRARIES}
13 )
12 )
14
13
plugins/UInput/CMakeLists.txt+1−1
@@ -3,5 +3,5 @@ add_library(UInput-qml MODULE
3 uinput.cpp
3 uinput.cpp
4)
4)
5
5
6−qt5_use_modules(UInput-qml Qml)
6+target_link_libraries(UInput-qml Qt5::Qml)
7add_unity8_plugin(UInput 0.1 UInput TARGETS UInput-qml)
7add_unity8_plugin(UInput 0.1 UInput TARGETS UInput-qml)
plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt+4−2
@@ -11,8 +11,10 @@ set(DOWNLOADDAEMONLISTENER_SOURCES
11
11
12add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})
12add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})
13
13
14−qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
15pkg_check_modules(DDLADAPTER REQUIRED udm-common)
14pkg_check_modules(DDLADAPTER REQUIRED udm-common)
16add_definitions(${DDLADAPTER_CFLAGS} ${DDLADAPTER_CFLAGS_OTHER})
15add_definitions(${DDLADAPTER_CFLAGS} ${DDLADAPTER_CFLAGS_OTHER})
17−target_link_libraries(DownloadDaemonListener ${DDLADAPTER_LIBRARIES})
16+target_link_libraries(DownloadDaemonListener
17+ Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Core
18+ ${DDLADAPTER_LIBRARIES}
19+ )
18add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
20add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
plugins/Ubuntu/Gestures/CMakeLists.txt+1−3
@@ -17,9 +17,7 @@ pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)
17add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
17add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
18
18
19add_library(UbuntuGesturesQml SHARED ${UbuntuGesturesQml_SOURCES})
19add_library(UbuntuGesturesQml SHARED ${UbuntuGesturesQml_SOURCES})
20−target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
20+target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES} Qt5::Core Qt5::Quick)
21−
22−qt5_use_modules(UbuntuGesturesQml Core Quick)
23
21
24# So that Foo.cpp can #include "Foo.moc"
22# So that Foo.cpp can #include "Foo.moc"
25include_directories(${CMAKE_CURRENT_BINARY_DIR})
23include_directories(${CMAKE_CURRENT_BINARY_DIR})
plugins/Unity/ApplicationMenu/CMakeLists.txt+1−1
@@ -14,6 +14,6 @@ qt5_add_dbus_adaptor(applicationMenu_SRCS com.ubuntu.MenuRegistrar.xml dbusappli
14
14
15add_library(ApplicationMenu-qml MODULE ${applicationMenu_SRCS})
15add_library(ApplicationMenu-qml MODULE ${applicationMenu_SRCS})
16
16
17−qt5_use_modules(ApplicationMenu-qml DBus Qml)
17+target_link_libraries(ApplicationMenu-qml Qt5::DBus Qt5::Qml)
18
18
19add_unity8_plugin(Unity.ApplicationMenu 0.1 Unity/ApplicationMenu TARGETS ApplicationMenu-qml)
19add_unity8_plugin(Unity.ApplicationMenu 0.1 Unity/ApplicationMenu TARGETS ApplicationMenu-qml)
plugins/Unity/Connectivity/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(CONNECTIVITY_SOURCES
5
5
6add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})
6add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})
7
7
8−qt5_use_modules(Connectivity Qml DBus Core)
8+target_link_libraries(Connectivity Qt5::Qml Qt5::DBus Qt5::Core)
9
9
10add_unity8_plugin(Unity.Connectivity 0.1 Unity/Connectivity TARGETS Connectivity)
10add_unity8_plugin(Unity.Connectivity 0.1 Unity/Connectivity TARGETS Connectivity)
plugins/Unity/DashCommunicator/CMakeLists.txt+1−2
@@ -16,9 +16,8 @@ add_library(DashCommunicator-qml MODULE
16 ${QMLDASHCOMMUNICATORPLUGIN_SRC}
16 ${QMLDASHCOMMUNICATORPLUGIN_SRC}
17)
17)
18
18
19−qt5_use_modules(DashCommunicator-qml DBus Qml)
20−
21target_link_libraries(DashCommunicator-qml
19target_link_libraries(DashCommunicator-qml
20+ Qt5::DBus Qt5::Qml
22 unity8-private
21 unity8-private
23)
22)
24
23
plugins/Unity/Indicators/CMakeLists.txt+1−2
@@ -44,8 +44,7 @@ target_link_libraries(IndicatorsQml
44 ${GLIB_LIBRARIES}
44 ${GLIB_LIBRARIES}
45 ${GIO_LIBRARIES}
45 ${GIO_LIBRARIES}
46 ${QMENUMODEL_LDFLAGS}
46 ${QMENUMODEL_LDFLAGS}
47+ Qt5::Core Qt5::Qml Qt5::Quick Qt5::DBus
47)
48)
48
49
49−qt5_use_modules(IndicatorsQml Core Qml Quick DBus)
50−
51add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)
50add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)
plugins/Unity/InputInfo/CMakeLists.txt+1−2
@@ -32,8 +32,7 @@ add_library(InputInfo SHARED
32target_link_libraries(InputInfo
32target_link_libraries(InputInfo
33 ${LIBUDEV_LDFLAGS}
33 ${LIBUDEV_LDFLAGS}
34 ${LIBEVDEV_LDFLAGS}
34 ${LIBEVDEV_LDFLAGS}
35+ Qt5::Core Qt5::Qml Qt5::Quick
35)
36)
36
37
37−qt5_use_modules(InputInfo Core Qml Quick)
38−
39add_unity8_plugin(Unity.InputInfo 0.1 Unity/InputInfo TARGETS InputInfo)
38add_unity8_plugin(Unity.InputInfo 0.1 Unity/InputInfo TARGETS InputInfo)
plugins/Unity/Launcher/CMakeLists.txt+1−2
@@ -47,8 +47,7 @@ target_link_libraries(UnityLauncher-qml
47 ${GSETTINGS_QT_LDFLAGS}
47 ${GSETTINGS_QT_LDFLAGS}
48 ${GLIB_LIBRARIES}
48 ${GLIB_LIBRARIES}
49 ${UAL_LIBRARIES}
49 ${UAL_LIBRARIES}
50+ Qt5::DBus Qt5::Qml Qt5::Gui
50 )
51 )
51
52
52−qt5_use_modules(UnityLauncher-qml DBus Qml Gui)
53−
54add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
53add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
plugins/Unity/Platform/CMakeLists.txt+1−1
@@ -6,6 +6,6 @@ set(platformplugin_SRCS
6
6
7add_library(Platform-qml SHARED ${platformplugin_SRCS})
7add_library(Platform-qml SHARED ${platformplugin_SRCS})
8
8
9−qt5_use_modules(Platform-qml DBus Qml)
9+target_link_libraries(Platform-qml Qt5::DBus Qt5::Qml)
10
10
11add_unity8_plugin(Unity.Platform 1.0 Unity/Platform TARGETS Platform-qml)
11add_unity8_plugin(Unity.Platform 1.0 Unity/Platform TARGETS Platform-qml)
plugins/Unity/Session/CMakeLists.txt+1−1
@@ -18,8 +18,8 @@ add_library(UnitySession-qml MODULE
18 ${QMLSESSIONPLUGIN_SRC}
18 ${QMLSESSIONPLUGIN_SRC}
19 )
19 )
20
20
21−qt5_use_modules(UnitySession-qml DBus Qml)
22target_link_libraries(UnitySession-qml
21target_link_libraries(UnitySession-qml
22+ Qt5::DBus Qt5::Qml
23 unity8-private
23 unity8-private
24 ${GIO_LDFLAGS}
24 ${GIO_LDFLAGS}
25 ${GLIB_LIBRARIES}
25 ${GLIB_LIBRARIES}
plugins/Utils/CMakeLists.txt+4−3
@@ -44,7 +44,10 @@ add_library(Utils-qml SHARED
44 ${QMLPLUGIN_SRC}
44 ${QMLPLUGIN_SRC}
45 )
45 )
46
46
47−target_link_libraries(Utils-qml ${GIO_LDFLAGS})
47+target_link_libraries(Utils-qml
48+ ${GIO_LDFLAGS}
49+ Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui Qt5::Sql Qt5::Concurrent
50+ )
48
51
49# Because this is an internal support library, we want
52# Because this is an internal support library, we want
50# to expose all symbols in it. Consider changing this
53# to expose all symbols in it. Consider changing this
@@ -52,6 +55,4 @@ target_link_libraries(Utils-qml ${GIO_LDFLAGS})
52# files directly in targets.
55# files directly in targets.
53set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
56set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
54
57
55−qt5_use_modules(Utils-qml Qml Quick DBus Network Gui Sql Concurrent)
56−
57add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)
58add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)
plugins/WindowManager/CMakeLists.txt+1−1
@@ -20,6 +20,6 @@ include_directories(
20
20
21add_library(windowmanager-qml SHARED ${WINDOWMANAGER_SRC})
21add_library(windowmanager-qml SHARED ${WINDOWMANAGER_SRC})
22
22
23−qt5_use_modules(windowmanager-qml Qml Quick Gui)
23+target_link_libraries(windowmanager-qml Qt5::Qml Qt5::Quick Qt5::Gui)
24
24
25add_unity8_plugin(WindowManager 0.1 WindowManager TARGETS windowmanager-qml)
25add_unity8_plugin(WindowManager 0.1 WindowManager TARGETS windowmanager-qml)
plugins/Wizard/CMakeLists.txt+4−2
@@ -12,8 +12,10 @@ add_library(Wizard-qml MODULE
12 keyboardLayoutsModel.cpp
12 keyboardLayoutsModel.cpp
13)
13)
14
14
15−qt5_use_modules(Wizard-qml DBus Qml)
15+target_link_libraries(Wizard-qml
16+ Qt5::DBus Qt5::Qml
16−target_link_libraries(Wizard-qml ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
17+ ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS}
18+)
17add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
19add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
18
20
19set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
21set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
plugins/Wizard/Utils/CMakeLists.txt+1−1
@@ -20,7 +20,7 @@ add_library(WizardUtils-qml SHARED
20# files directly in targets.
20# files directly in targets.
21set_target_properties(WizardUtils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
21set_target_properties(WizardUtils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
22
22
23−qt5_use_modules(WizardUtils-qml DBus Qml Quick)
23+target_link_libraries(WizardUtils-qml Qt5::DBus Qt5::Qml Qt5::Quick)
24
24
25set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Wizard/Utils)
25set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Wizard/Utils)
26install(FILES qmldir DESTINATION ${PLUG_DIR})
26install(FILES qmldir DESTINATION ${PLUG_DIR})
src/CMakeLists.txt+5−2
@@ -44,12 +44,15 @@ endif()
44
44
45pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
45pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
46add_executable(${SHELL_APP} ${SOURCE_FILES})
46add_executable(${SHELL_APP} ${SOURCE_FILES})
47−qt5_use_modules(${SHELL_APP} DBus Gui Qml Quick Test)
48
47
49if (NOT "${ANDROID_PROPERTIES_INCLUDE_DIRS}" STREQUAL "")
48if (NOT "${ANDROID_PROPERTIES_INCLUDE_DIRS}" STREQUAL "")
50 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${ANDROID_PROPERTIES_INCLUDE_DIRS})
49 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${ANDROID_PROPERTIES_INCLUDE_DIRS})
51endif()
50endif()
51+target_link_libraries(${SHELL_APP}
52+ Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Quick Qt5::Test
52−target_link_libraries(${SHELL_APP} ${ANDROID_PROPERTIES_LDFLAGS} ${GSETTINGS_QT_LDFLAGS} UbuntuGestures connectivity-qt1 unity8-private)
53+ ${ANDROID_PROPERTIES_LDFLAGS} ${GSETTINGS_QT_LDFLAGS}
54+ UbuntuGestures connectivity-qt1 unity8-private
55+ )
53
56
54if (ENABLE_TOUCH_EMULATION)
57if (ENABLE_TOUCH_EMULATION)
55 target_link_libraries(${SHELL_APP} ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
58 target_link_libraries(${SHELL_APP} ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
src/Dash/CMakeLists.txt+4−3
@@ -10,12 +10,13 @@ endif()
10
10
11add_executable(unity8-dash ${DASH_SRCS})
11add_executable(unity8-dash ${DASH_SRCS})
12
12
13−qt5_use_modules(unity8-dash DBus Gui Qml Quick Test)
14−
15# For it to find libUbuntuGestures.so, needed by Ubuntu.Gestures QML module.
13# For it to find libUbuntuGestures.so, needed by Ubuntu.Gestures QML module.
16set_target_properties(unity8-dash PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
14set_target_properties(unity8-dash PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
17
15
18−target_link_libraries(unity8-dash UbuntuGestures connectivity-qt1)
16+target_link_libraries(unity8-dash
17+ Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Quick Qt5::Test
18+ UbuntuGestures connectivity-qt1
19+)
19
20
20if (ENABLE_TOUCH_EMULATION)
21if (ENABLE_TOUCH_EMULATION)
21 target_link_libraries(unity8-dash ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
22 target_link_libraries(unity8-dash ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
src/libunity8-private/CMakeLists.txt+1−1
@@ -19,7 +19,7 @@ set_target_properties(${LIB_NAME} PROPERTIES
19 SOVERSION ${SOVERSION}
19 SOVERSION ${SOVERSION}
20 )
20 )
21
21
22−qt5_use_modules(${LIB_NAME} DBus)
22+target_link_libraries(${LIB_NAME} Qt5::DBus)
23
23
24# install library
24# install library
25install(TARGETS ${LIB_NAME}
25install(TARGETS ${LIB_NAME}
tests/mocks/AccountsService/CMakeLists.txt+1−2
@@ -14,9 +14,8 @@ add_library(MockAccountsService-qml MODULE
14 plugin.cpp
14 plugin.cpp
15 )
15 )
16
16
17−qt5_use_modules(MockAccountsService-qml DBus Qml)
18−
19target_link_libraries(MockAccountsService-qml
17target_link_libraries(MockAccountsService-qml
18+ Qt5::DBus Qt5::Qml
20 MockLightDM
19 MockLightDM
21 )
20 )
22
21
tests/mocks/Biometryd/CMakeLists.txt+1−1
@@ -9,6 +9,6 @@ set(MOCK_BIOMETRYD_SOURCES
9
9
10add_library(MockBiometryd MODULE ${MOCK_BIOMETRYD_SOURCES})
10add_library(MockBiometryd MODULE ${MOCK_BIOMETRYD_SOURCES})
11
11
12−qt5_use_modules(MockBiometryd Qml Quick Core)
12+target_link_libraries(MockBiometryd Qt5::Qml Qt5::Quick Qt5::Core)
13
13
14add_unity8_mock(Biometryd 0.0 Biometryd TARGETS MockBiometryd)
14add_unity8_mock(Biometryd 0.0 Biometryd TARGETS MockBiometryd)
tests/mocks/GSettings.1.0/CMakeLists.txt+1−2
@@ -13,8 +13,7 @@ add_library(FakeGSettingsQml MODULE ${GSettingsQML_SOURCES})
13target_link_libraries(FakeGSettingsQml
13target_link_libraries(FakeGSettingsQml
14 ${Qt5Core_LIBRARIES}
14 ${Qt5Core_LIBRARIES}
15 ${Qt5Quick_LIBRARIES}
15 ${Qt5Quick_LIBRARIES}
16+ Qt5::Qml
16)
17)
17
18
18−qt5_use_modules(FakeGSettingsQml Qml)
19−
20add_unity8_mock(GSettings 1.0 GSettings.1.0 TARGETS FakeGSettingsQml)
19add_unity8_mock(GSettings 1.0 GSettings.1.0 TARGETS FakeGSettingsQml)
tests/mocks/LightDMController/CMakeLists.txt+1−2
@@ -8,8 +8,7 @@ target_include_directories(LightDMController PUBLIC
8
8
9target_link_libraries(LightDMController
9target_link_libraries(LightDMController
10 MockLightDM
10 MockLightDM
11+ Qt5::Qml
11 )
12 )
12
13
13−qt5_use_modules(LightDMController Qml)
14−
15add_unity8_mock(LightDMController 0.1 LightDMController TARGETS LightDMController)
14add_unity8_mock(LightDMController 0.1 LightDMController TARGETS LightDMController)
tests/mocks/Lights/CMakeLists.txt+1−1
@@ -3,6 +3,6 @@ add_library(MockLights-qml MODULE
3 Lights.cpp
3 Lights.cpp
4 )
4 )
5
5
6−qt5_use_modules(MockLights-qml Qml Gui)
6+target_link_libraries(MockLights-qml Qt5::Qml Qt5::Gui)
7
7
8add_unity8_mock(Lights 0.1 Lights TARGETS MockLights-qml)
8add_unity8_mock(Lights 0.1 Lights TARGETS MockLights-qml)
tests/mocks/MeeGo/QOfono/CMakeLists.txt+1−1
@@ -6,6 +6,6 @@ set(MOCK_QOFONO_SOURCES
6
6
7add_library(MockQOfono MODULE ${MOCK_QOFONO_SOURCES})
7add_library(MockQOfono MODULE ${MOCK_QOFONO_SOURCES})
8
8
9−qt5_use_modules(MockQOfono Qml Quick Core)
9+target_link_libraries(MockQOfono Qt5::Qml Qt5::Quick Qt5::Core)
10
10
11add_unity8_mock(MeeGo.QOfono 0.2 MeeGo/QOfono TARGETS MockQOfono)
11add_unity8_mock(MeeGo.QOfono 0.2 MeeGo/QOfono TARGETS MockQOfono)
tests/mocks/Powerd/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ add_library(MockPowerd-qml MODULE
5 Powerd.cpp
5 Powerd.cpp
6 )
6 )
7
7
8−qt5_use_modules(MockPowerd-qml Qml)
8+target_link_libraries(MockPowerd-qml Qt5::Qml)
9
9
10add_unity8_mock(Powerd 0.1 Powerd TARGETS MockPowerd-qml)
10add_unity8_mock(Powerd 0.1 Powerd TARGETS MockPowerd-qml)
tests/mocks/QMenuModel/CMakeLists.txt+1−2
@@ -15,10 +15,9 @@ add_library(QMenuModelQml SHARED ${QMenuModelQml_SOURCES})
15target_link_libraries(QMenuModelQml
15target_link_libraries(QMenuModelQml
16 ${Qt5Core_LIBRARIES}
16 ${Qt5Core_LIBRARIES}
17 ${Qt5Quick_LIBRARIES}
17 ${Qt5Quick_LIBRARIES}
18+ Qt5::Core Qt5::Quick
18)
19)
19
20
20−qt5_use_modules(QMenuModelQml Core Quick)
21−
22set_target_properties(QMenuModelQml PROPERTIES
21set_target_properties(QMenuModelQml PROPERTIES
23 OUTPUT_NAME qmenumodel
22 OUTPUT_NAME qmenumodel
24 VERSION 0)
23 VERSION 0)
tests/mocks/QtMultimedia/CMakeLists.txt+1−1
@@ -10,6 +10,6 @@ add_library(QtMultimedia-qml MODULE
10 declarativeplaylist.cpp
10 declarativeplaylist.cpp
11 )
11 )
12
12
13−qt5_use_modules(QtMultimedia-qml Qml Quick)
13+target_link_libraries(QtMultimedia-qml Qt5::Qml Qt5::Quick)
14
14
15add_unity8_mock(QtMultimedia 5.0 QtMultimedia TARGETS QtMultimedia-qml)
15add_unity8_mock(QtMultimedia 5.0 QtMultimedia TARGETS QtMultimedia-qml)
tests/mocks/SessionBroadcast/CMakeLists.txt+1−1
@@ -3,6 +3,6 @@ add_library(MockSessionBroadcast-qml MODULE
3 SessionBroadcast.cpp
3 SessionBroadcast.cpp
4 )
4 )
5
5
6−qt5_use_modules(MockSessionBroadcast-qml Qml)
6+target_link_libraries(MockSessionBroadcast-qml Qt5::Qml)
7
7
8add_unity8_mock(SessionBroadcast 0.1 SessionBroadcast TARGETS MockSessionBroadcast-qml)
8add_unity8_mock(SessionBroadcast 0.1 SessionBroadcast TARGETS MockSessionBroadcast-qml)
tests/mocks/UInput/CMakeLists.txt+1−1
@@ -3,5 +3,5 @@ add_library(FakeUInput-qml MODULE
3 mockuinput.cpp
3 mockuinput.cpp
4)
4)
5
5
6−qt5_use_modules(FakeUInput-qml Qml)
6+target_link_libraries(FakeUInput-qml Qt5::Qml)
7add_unity8_mock(UInput 0.1 UInput TARGETS FakeUInput-qml)
7add_unity8_mock(UInput 0.1 UInput TARGETS FakeUInput-qml)
tests/mocks/Ubuntu/Connectivity/CMakeLists.txt+1−1
@@ -2,7 +2,7 @@ add_library(connectivity-qml SHARED
2 networking-status.cpp
2 networking-status.cpp
3 plugin.cpp
3 plugin.cpp
4)
4)
5−qt5_use_modules(connectivity-qml Qml)
5+target_link_libraries(connectivity-qml Qt5::Qml)
6
6
7# copy qmldir file into build directory for shadow builds
7# copy qmldir file into build directory for shadow builds
8file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
8file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(FakeUbuntuDownloadDaemonListenerQml_SOURCES
5
5
6add_library(FakeUbuntuDownloadDaemonListenerQml MODULE ${FakeUbuntuDownloadDaemonListenerQml_SOURCES})
6add_library(FakeUbuntuDownloadDaemonListenerQml MODULE ${FakeUbuntuDownloadDaemonListenerQml_SOURCES})
7
7
8−qt5_use_modules(FakeUbuntuDownloadDaemonListenerQml Core Quick)
8+target_link_libraries(FakeUbuntuDownloadDaemonListenerQml Qt5::Core Qt5::Quick)
9
9
10add_unity8_mock(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS FakeUbuntuDownloadDaemonListenerQml)
10add_unity8_mock(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS FakeUbuntuDownloadDaemonListenerQml)
tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(MOCK_SECURITYPRIVACY_SOURCES
5
5
6add_library(MockSecurityPrivacy MODULE ${MOCK_SECURITYPRIVACY_SOURCES})
6add_library(MockSecurityPrivacy MODULE ${MOCK_SECURITYPRIVACY_SOURCES})
7
7
8−qt5_use_modules(MockSecurityPrivacy Qml Quick Core)
8+target_link_libraries(MockSecurityPrivacy Qt5::Qml Qt5::Quick Qt5::Core)
9
9
10add_unity8_mock(Ubuntu.SystemSettings.SecurityPrivacy 1.0 Ubuntu/SystemSettings/SecurityPrivacy TARGETS MockSecurityPrivacy)
10add_unity8_mock(Ubuntu.SystemSettings.SecurityPrivacy 1.0 Ubuntu/SystemSettings/SecurityPrivacy TARGETS MockSecurityPrivacy)
tests/mocks/Ubuntu/Telephony/CMakeLists.txt+1−1
@@ -9,6 +9,6 @@ set(FakeUbuntuTelephonyQml_SOURCES
9
9
10add_library(FakeUbuntuTelephonyQml MODULE ${FakeUbuntuTelephonyQml_SOURCES})
10add_library(FakeUbuntuTelephonyQml MODULE ${FakeUbuntuTelephonyQml_SOURCES})
11
11
12−qt5_use_modules(FakeUbuntuTelephonyQml Core Quick)
12+target_link_libraries(FakeUbuntuTelephonyQml Qt5::Core Qt5::Quick)
13
13
14add_unity8_mock(Ubuntu.Telephony 0.1 Ubuntu/Telephony TARGETS FakeUbuntuTelephonyQml)
14add_unity8_mock(Ubuntu.Telephony 0.1 Ubuntu/Telephony TARGETS FakeUbuntuTelephonyQml)
tests/mocks/Unity/Application/CMakeLists.txt+2−2
@@ -24,8 +24,8 @@ add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
24add_library(NonMirUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
24add_library(NonMirUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
25set_target_properties(NonMirUnityApplicationQml PROPERTIES OUTPUT_NAME FakeUnityApplicationQml)
25set_target_properties(NonMirUnityApplicationQml PROPERTIES OUTPUT_NAME FakeUnityApplicationQml)
26
26
27−qt5_use_modules(FakeUnityApplicationQml Core Quick DBus)
27+target_link_libraries(FakeUnityApplicationQml Qt5::Core Qt5::Quick Qt5::DBus)
28−qt5_use_modules(NonMirUnityApplicationQml Core Quick DBus)
28+target_link_libraries(NonMirUnityApplicationQml Qt5::Core Qt5::Quick Qt5::DBus)
29
29
30add_unity8_mock(Unity.Application 0.1 Unity/Application TARGETS FakeUnityApplicationQml)
30add_unity8_mock(Unity.Application 0.1 Unity/Application TARGETS FakeUnityApplicationQml)
31add_unity8_mock(Unity.Application 0.1 Unity/Application
31add_unity8_mock(Unity.Application 0.1 Unity/Application
tests/mocks/Unity/ApplicationMenu/CMakeLists.txt+1−1
@@ -13,6 +13,6 @@ set(FakeApplicationMenu_SRCS
13
13
14add_library(FakeApplicationMenu-qml MODULE ${FakeApplicationMenu_SRCS})
14add_library(FakeApplicationMenu-qml MODULE ${FakeApplicationMenu_SRCS})
15
15
16−qt5_use_modules(FakeApplicationMenu-qml Qml DBus)
16+target_link_libraries(FakeApplicationMenu-qml Qt5::Qml Qt5::DBus)
17
17
18add_unity8_mock(Unity.ApplicationMenu 1.0 Unity/ApplicationMenu PREFIX mocks TARGETS FakeApplicationMenu-qml)
18add_unity8_mock(Unity.ApplicationMenu 1.0 Unity/ApplicationMenu PREFIX mocks TARGETS FakeApplicationMenu-qml)
tests/mocks/Unity/CMakeLists.txt+1−1
@@ -67,7 +67,7 @@ target_link_libraries(FakeUnityQml
67 ${GOBJECT_LDFLAGS}
67 ${GOBJECT_LDFLAGS}
68)
68)
69
69
70−qt5_use_modules(FakeUnityQml Qml)
70+target_link_libraries(FakeUnityQml Qt5::Qml)
71
71
72add_unity8_mock(Unity 0.2 Unity TARGETS FakeUnityQml)
72add_unity8_mock(Unity 0.2 Unity TARGETS FakeUnityQml)
73
73
tests/mocks/Unity/Connectivity/CMakeLists.txt+1−1
@@ -5,6 +5,6 @@ set(MOCK_CONNECTIVITY_SOURCES
5
5
6add_library(MockConnectivity MODULE ${MOCK_CONNECTIVITY_SOURCES})
6add_library(MockConnectivity MODULE ${MOCK_CONNECTIVITY_SOURCES})
7
7
8−qt5_use_modules(MockConnectivity Qml Quick Core)
8+target_link_libraries(MockConnectivity Qt5::Qml Qt5::Quick Qt5::Core)
9
9
10add_unity8_mock(Unity.Connectivity 0.1 Unity/Connectivity TARGETS MockConnectivity)
10add_unity8_mock(Unity.Connectivity 0.1 Unity/Connectivity TARGETS MockConnectivity)
tests/mocks/Unity/DashCommunicator/CMakeLists.txt+1−1
@@ -12,7 +12,7 @@ add_library(MockDashCommunicator-qml MODULE
12 ${QMLDASHCOMMUNICATORPLUGIN_SRC}
12 ${QMLDASHCOMMUNICATORPLUGIN_SRC}
13 )
13 )
14
14
15−qt5_use_modules(MockDashCommunicator-qml DBus Qml)
15+target_link_libraries(MockDashCommunicator-qml Qt5::DBus Qt5::Qml)
16
16
17# export the qmldir and qmltypes files
17# export the qmldir and qmltypes files
18add_unity8_mock(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS MockDashCommunicator-qml)
18add_unity8_mock(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS MockDashCommunicator-qml)
tests/mocks/Unity/Indicators/CMakeLists.txt+1−2
@@ -29,12 +29,11 @@ add_definitions(-DUNITYINDICATORS_LIBRARY)
29
29
30target_link_libraries(IndicatorsFakeQml
30target_link_libraries(IndicatorsFakeQml
31 QMenuModelQml
31 QMenuModelQml
32+ Qt5::Core Qt5::Qml Qt5::Quick
32)
33)
33
34
34set_target_properties(IndicatorsFakeQml PROPERTIES
35set_target_properties(IndicatorsFakeQml PROPERTIES
35 INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/mocks/QMenuModel"
36 INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_INSTALL_QML}/mocks/QMenuModel"
36)
37)
37
38
38−qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
39−
40add_unity8_mock(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsFakeQml)
39add_unity8_mock(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsFakeQml)
tests/mocks/Unity/InputInfo/CMakeLists.txt+1−1
@@ -26,6 +26,6 @@ add_library(MockInputInfo SHARED
26 ${MockInputInfo_SOURCES}
26 ${MockInputInfo_SOURCES}
27)
27)
28
28
29−qt5_use_modules(MockInputInfo Core Qml Quick)
29+target_link_libraries(MockInputInfo Qt5::Core Qt5::Qml Qt5::Quick)
30
30
31add_unity8_mock(Unity.InputInfo 0.1 Unity/InputInfo TARGETS MockInputInfo)
31add_unity8_mock(Unity.InputInfo 0.1 Unity/InputInfo TARGETS MockInputInfo)
tests/mocks/Unity/Launcher/CMakeLists.txt+1−1
@@ -19,6 +19,6 @@ set(MockLauncherModel_SOURCES
19
19
20add_library(MockLauncherPlugin MODULE ${MockLauncherModel_SOURCES})
20add_library(MockLauncherPlugin MODULE ${MockLauncherModel_SOURCES})
21
21
22−qt5_use_modules(MockLauncherPlugin Core Quick)
22+target_link_libraries(MockLauncherPlugin Qt5::Core Qt5::Quick)
23
23
24add_unity8_mock(Unity.Launcher 0.1 Unity/Launcher TARGETS MockLauncherPlugin)
24add_unity8_mock(Unity.Launcher 0.1 Unity/Launcher TARGETS MockLauncherPlugin)
tests/mocks/Unity/Notifications/CMakeLists.txt+1−1
@@ -11,6 +11,6 @@ set(MockNotificationsPlugin_SOURCES
11
11
12add_library(MockNotificationsPlugin MODULE ${MockNotificationsPlugin_SOURCES})
12add_library(MockNotificationsPlugin MODULE ${MockNotificationsPlugin_SOURCES})
13
13
14−qt5_use_modules(MockNotificationsPlugin Core Quick)
14+target_link_libraries(MockNotificationsPlugin Qt5::Core Qt5::Quick)
15
15
16add_unity8_mock(Unity.Notifications 1.0 Unity/Notifications TARGETS MockNotificationsPlugin)
16add_unity8_mock(Unity.Notifications 1.0 Unity/Notifications TARGETS MockNotificationsPlugin)
tests/mocks/Unity/Screens/CMakeLists.txt+1−1
@@ -9,6 +9,6 @@ set(MockScreens_SOURCES
9
9
10add_library(MockScreensPlugin MODULE ${MockScreens_SOURCES})
10add_library(MockScreensPlugin MODULE ${MockScreens_SOURCES})
11
11
12−qt5_use_modules(MockScreensPlugin Gui Qml)
12+target_link_libraries(MockScreensPlugin Qt5::Gui Qt5::Qml)
13
13
14add_unity8_mock(Unity.Screens 0.1 Unity/Screens PREFIX mocks TARGETS MockScreensPlugin)
14add_unity8_mock(Unity.Screens 0.1 Unity/Screens PREFIX mocks TARGETS MockScreensPlugin)
tests/mocks/Utils/CMakeLists.txt+4−3
@@ -47,7 +47,10 @@ add_library(FakeUtils-qml SHARED
47 ${QMLPLUGIN_SRC}
47 ${QMLPLUGIN_SRC}
48 )
48 )
49
49
50−target_link_libraries(FakeUtils-qml ${GIO_LDFLAGS})
50+target_link_libraries(FakeUtils-qml
51+ ${GIO_LDFLAGS}
52+ Qt5::Qml Qt5::Quick Qt5::DBus Qt5::Network Qt5::Gui
53+ )
51
54
52# Because this is an internal support library, we want
55# Because this is an internal support library, we want
53# to expose all symbols in it. Consider changing this
56# to expose all symbols in it. Consider changing this
@@ -55,6 +58,4 @@ target_link_libraries(FakeUtils-qml ${GIO_LDFLAGS})
55# files directly in targets.
58# files directly in targets.
56set_target_properties(FakeUtils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
59set_target_properties(FakeUtils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
57
60
58−qt5_use_modules(FakeUtils-qml Qml Quick DBus Network Gui)
59−
60add_unity8_mock(Utils 0.1 Utils TARGETS FakeUtils-qml)
61add_unity8_mock(Utils 0.1 Utils TARGETS FakeUtils-qml)
tests/mocks/Wizard/CMakeLists.txt+1−2
@@ -15,6 +15,5 @@ add_library(MockWizard-qml MODULE
15 ${CMAKE_SOURCE_DIR}/plugins/Wizard/keyboardLayoutsModel.cpp
15 ${CMAKE_SOURCE_DIR}/plugins/Wizard/keyboardLayoutsModel.cpp
16)
16)
17
17
18−qt5_use_modules(MockWizard-qml DBus Qml)
19−target_link_libraries(MockWizard-qml ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
18+target_link_libraries(MockWizard-qml Qt5::DBus Qt5::Qml ${GD3_LDFLAGS} ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
20add_unity8_mock(Wizard 0.1 Wizard TARGETS MockWizard-qml)
19add_unity8_mock(Wizard 0.1 Wizard TARGETS MockWizard-qml)
tests/mocks/liblightdm/CMakeLists.txt+1−1
@@ -7,7 +7,7 @@ set(MockLightDM_SOURCES
7
7
8add_library(MockLightDM SHARED ${MockLightDM_SOURCES})
8add_library(MockLightDM SHARED ${MockLightDM_SOURCES})
9
9
10−qt5_use_modules(MockLightDM DBus Gui)
10+target_link_libraries(MockLightDM Qt5::DBus Qt5::Gui)
11
11
12set_target_properties(MockLightDM PROPERTIES
12set_target_properties(MockLightDM PROPERTIES
13 OUTPUT_NAME lightdm-qt5-3
13 OUTPUT_NAME lightdm-qt5-3
tests/mocks/liblightdm/demo/CMakeLists.txt+1−1
@@ -18,4 +18,4 @@ target_link_libraries(MockLightDM-demo
18 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
18 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
19 )
19 )
20
20
21−qt5_use_modules(MockLightDM-demo Gui)
21+target_link_libraries(MockLightDM-demo Qt5::Gui)
tests/mocks/libusermetrics/CMakeLists.txt+1−1
@@ -6,7 +6,7 @@ set(mock_SOURCES
6
6
7add_library(MockUserMetrics SHARED ${mock_SOURCES})
7add_library(MockUserMetrics SHARED ${mock_SOURCES})
8
8
9−qt5_use_modules(MockUserMetrics Gui)
9+target_link_libraries(MockUserMetrics Qt5::Gui)
10
10
11include_directories(
11include_directories(
12 ${CMAKE_SOURCE_DIR}/plugins/Utils
12 ${CMAKE_SOURCE_DIR}/plugins/Utils
tests/plugins/AccountsService/CMakeLists.txt+2−2
@@ -40,7 +40,7 @@ add_executable(mock-server
40 PropertiesServer.cpp
40 PropertiesServer.cpp
41 UscServer.cpp
41 UscServer.cpp
42 )
42 )
43−qt5_use_modules(mock-server Core DBus)
43+target_link_libraries(mock-server Qt5::Core Qt5::DBus)
44install(TARGETS mock-server
44install(TARGETS mock-server
45 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/AccountsService"
45 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/AccountsService"
46)
46)
@@ -50,7 +50,7 @@ add_executable(test-accountsservice
50 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
50 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
51 client.cpp
51 client.cpp
52 )
52 )
53−qt5_use_modules(test-accountsservice Core DBus Test)
53+target_link_libraries(test-accountsservice Qt5::Core Qt5::DBus Qt5::Test)
54install(TARGETS test-accountsservice
54install(TARGETS test-accountsservice
55 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/AccountsService"
55 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/AccountsService"
56)
56)
tests/plugins/Dash/CMakeLists.txt+4−8
@@ -32,8 +32,7 @@ macro(add_lvwph_test FILENAME TESTNAME)
32 add_executable(${TESTNAME}TestExec
32 add_executable(${TESTNAME}TestExec
33 ${FILENAME}test.cpp
33 ${FILENAME}test.cpp
34 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/listviewwithpageheader.cpp)
34 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/listviewwithpageheader.cpp)
35− qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
36− target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
35+ target_link_libraries(${TESTNAME}TestExec Qt5::Test Qt5::Core Qt5::Qml ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
37 install(TARGETS ${TESTNAME}TestExec
36 install(TARGETS ${TESTNAME}TestExec
38 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
37 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
39 )
38 )
@@ -51,8 +50,7 @@ macro(add_dashview_try_test FILENAME TESTNAME)
51 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/${FILENAME}.cpp
50 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/${FILENAME}.cpp
52 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/abstractdashview.cpp
51 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/abstractdashview.cpp
53 )
52 )
54− qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
55− target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
53+ target_link_libraries(${TESTNAME}TestExec Qt5::Test Qt5::Core Qt5::Qml ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
56 install(TARGETS ${TESTNAME}TestExec
54 install(TARGETS ${TESTNAME}TestExec
57 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
55 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
58 )
56 )
@@ -64,8 +62,7 @@ macro(add_dashview_try_test FILENAME TESTNAME)
64 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/${FILENAME}.cpp
62 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/${FILENAME}.cpp
65 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/abstractdashview.cpp
63 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/abstractdashview.cpp
66 )
64 )
67− qt5_use_modules(${TESTNAME}TryExec Test Core Qml)
68− target_link_libraries(${TESTNAME}TryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
65+ target_link_libraries(${TESTNAME}TryExec Qt5::Test Qt5::Core Qt5::Qml ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
69 install(TARGETS ${TESTNAME}TryExec
66 install(TARGETS ${TESTNAME}TryExec
70 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
67 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
71 )
68 )
@@ -84,8 +81,7 @@ endforeach()
84
81
85# CardCreator test
82# CardCreator test
86add_executable(CardCreatorTestExec cardcreatortest.cpp)
83add_executable(CardCreatorTestExec cardcreatortest.cpp)
87−qt5_use_modules(CardCreatorTestExec Test Core Qml)
84+target_link_libraries(CardCreatorTestExec Qt5::Test Qt5::Core Qt5::Qml ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
88−target_link_libraries(CardCreatorTestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
89install(TARGETS CardCreatorTestExec
85install(TARGETS CardCreatorTestExec
90 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
86 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
91)
87)
tests/plugins/GlobalShortcut/CMakeLists.txt+1−2
@@ -6,8 +6,7 @@ include_directories(
6add_definitions(-DTEST_DIR="plugins/GlobalShortcut")
6add_definitions(-DTEST_DIR="plugins/GlobalShortcut")
7
7
8add_executable(GlobalShortcutTestExec GlobalShortcutTest.cpp ${CMAKE_SOURCE_DIR}/plugins/GlobalShortcut/globalshortcut.cpp)
8add_executable(GlobalShortcutTestExec GlobalShortcutTest.cpp ${CMAKE_SOURCE_DIR}/plugins/GlobalShortcut/globalshortcut.cpp)
9−qt5_use_modules(GlobalShortcutTestExec Test Quick)
9+target_link_libraries(GlobalShortcutTestExec Qt5::Test Qt5::Quick ${Qt5Quick_LIBRARIES} GlobalShortcut-qml)
10−target_link_libraries(GlobalShortcutTestExec ${Qt5Quick_LIBRARIES} GlobalShortcut-qml)
11install(TARGETS GlobalShortcutTestExec
10install(TARGETS GlobalShortcutTestExec
12 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/GlobalShortcut"
11 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/GlobalShortcut"
13)
12)
tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt+1−1
@@ -26,9 +26,9 @@ add_executable(launchermodelastestExec
26target_link_libraries(launchermodelastestExec
26target_link_libraries(launchermodelastestExec
27 unity8-private
27 unity8-private
28 ${GSETTINGS_QT_LDFLAGS}
28 ${GSETTINGS_QT_LDFLAGS}
29+ Qt5::Test Qt5::Core Qt5::DBus Qt5::Gui Qt5::Qml
29 )
30 )
30add_dependencies(launchermodelastestExec mock-server)
31add_dependencies(launchermodelastestExec mock-server)
31−qt5_use_modules(launchermodelastestExec Test Core DBus Gui Qml)
32install(TARGETS launchermodelastestExec
32install(TARGETS launchermodelastestExec
33 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Greeter/Unity/Launcher"
33 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Greeter/Unity/Launcher"
34)
34)
tests/plugins/ImageCache/CMakeLists.txt+1−1
@@ -14,7 +14,7 @@ remove_definitions(-DQT_NO_KEYWORDS)
14add_executable(ImageCacheTestExec
14add_executable(ImageCacheTestExec
15 test.cpp
15 test.cpp
16 )
16 )
17−qt5_use_modules(ImageCacheTestExec Core Quick Test)
17+target_link_libraries(ImageCacheTestExec Qt5::Core Qt5::Quick Qt5::Test)
18add_unity8_uitest(ImageCache ImageCacheTestExec
18add_unity8_uitest(ImageCache ImageCacheTestExec
19 DEPENDS ImageCache-qml
19 DEPENDS ImageCache-qml
20 IMPORT_PATHS ${UNITY_PLUGINPATH}
20 IMPORT_PATHS ${UNITY_PLUGINPATH}
tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt+6−6
@@ -12,8 +12,8 @@ add_executable(GreeterDBusTestExec
12# This add_dependencies is needed since we're linking with with -L and -l below
12# This add_dependencies is needed since we're linking with with -L and -l below
13# make seems to work but ninja breaks without it
13# make seems to work but ninja breaks without it
14add_dependencies(GreeterDBusTestExec MockLightDM)
14add_dependencies(GreeterDBusTestExec MockLightDM)
15−qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
16target_link_libraries(GreeterDBusTestExec
15target_link_libraries(GreeterDBusTestExec
16+ Qt5::Core Qt5::DBus Qt5::Quick Qt5::Test
17 MockLightDM
17 MockLightDM
18 )
18 )
19target_include_directories(GreeterDBusTestExec PUBLIC
19target_include_directories(GreeterDBusTestExec PUBLIC
@@ -36,8 +36,8 @@ add_executable(GreeterPamTestExec
36 pam.cpp
36 pam.cpp
37 ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp
37 ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp
38 )
38 )
39−qt5_use_modules(GreeterPamTestExec Concurrent Core Test)
40target_link_libraries(GreeterPamTestExec
39target_link_libraries(GreeterPamTestExec
40+ Qt5::Concurrent Qt5::Core Qt5::Test
41 integratedLightDM
41 integratedLightDM
42 )
42 )
43
43
@@ -57,8 +57,8 @@ add_executable(GreeterSessionsModelTestExec
57 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
57 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
58 )
58 )
59add_dependencies(GreeterSessionsModelTestExec MockLightDM)
59add_dependencies(GreeterSessionsModelTestExec MockLightDM)
60−qt5_use_modules(GreeterSessionsModelTestExec Core Test)
61target_link_libraries(GreeterSessionsModelTestExec
60target_link_libraries(GreeterSessionsModelTestExec
61+ Qt5::Core Qt5::Test
62 MockLightDM
62 MockLightDM
63 )
63 )
64target_include_directories(GreeterSessionsModelTestExec PUBLIC
64target_include_directories(GreeterSessionsModelTestExec PUBLIC
@@ -84,8 +84,8 @@ add_executable(GreeterUsersModelTestExec
84# This add_dependencies is needed since we're linking with with -L and -l below
84# This add_dependencies is needed since we're linking with with -L and -l below
85# make seems to work but ninja breaks without it
85# make seems to work but ninja breaks without it
86add_dependencies(GreeterUsersModelTestExec MockLightDM)
86add_dependencies(GreeterUsersModelTestExec MockLightDM)
87−qt5_use_modules(GreeterUsersModelTestExec Core Test)
88target_link_libraries(GreeterUsersModelTestExec
87target_link_libraries(GreeterUsersModelTestExec
88+ Qt5::Core Qt5::Test
89 MockLightDM
89 MockLightDM
90 )
90 )
91target_include_directories(GreeterUsersModelTestExec PUBLIC
91target_include_directories(GreeterUsersModelTestExec PUBLIC
@@ -111,8 +111,8 @@ add_executable(GreeterPromptsModelTestExec
111# This add_dependencies is needed since we're linking with with -L and -l below
111# This add_dependencies is needed since we're linking with with -L and -l below
112# make seems to work but ninja breaks without it
112# make seems to work but ninja breaks without it
113add_dependencies(GreeterPromptsModelTestExec MockLightDM)
113add_dependencies(GreeterPromptsModelTestExec MockLightDM)
114−qt5_use_modules(GreeterPromptsModelTestExec Core Test)
115target_link_libraries(GreeterPromptsModelTestExec
114target_link_libraries(GreeterPromptsModelTestExec
115+ Qt5::Core Qt5::Test
116 MockLightDM
116 MockLightDM
117 )
117 )
118target_include_directories(GreeterPromptsModelTestExec PUBLIC
118target_include_directories(GreeterPromptsModelTestExec PUBLIC
@@ -131,8 +131,8 @@ add_unity8_uitest(GreeterPrompts GreeterPromptsModelTestExec
131add_executable(GreeterIntegratedTestExec
131add_executable(GreeterIntegratedTestExec
132 integrated.cpp
132 integrated.cpp
133 )
133 )
134−qt5_use_modules(GreeterIntegratedTestExec Core DBus Quick Test)
135target_link_libraries(GreeterIntegratedTestExec
134target_link_libraries(GreeterIntegratedTestExec
135+ Qt5::Core Qt5::DBus Qt5::Quick Qt5::Test
136 ${GLIB_LIBRARIES}
136 ${GLIB_LIBRARIES}
137 integratedLightDMSession
137 integratedLightDMSession
138 )
138 )
tests/plugins/SessionBroadcast/CMakeLists.txt+2−2
@@ -24,7 +24,7 @@ add_executable(MockBroadcastServer
24 server.cpp
24 server.cpp
25 BroadcastServer.cpp
25 BroadcastServer.cpp
26)
26)
27−qt5_use_modules(MockBroadcastServer Core DBus)
27+target_link_libraries(MockBroadcastServer Qt5::Core Qt5::DBus)
28install(TARGETS MockBroadcastServer
28install(TARGETS MockBroadcastServer
29 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/SessionBroadcast"
29 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/SessionBroadcast"
30)
30)
@@ -34,7 +34,7 @@ add_executable(sessionbroadcasttestExec
34 ${CMAKE_SOURCE_DIR}/plugins/SessionBroadcast/SessionBroadcast.cpp
34 ${CMAKE_SOURCE_DIR}/plugins/SessionBroadcast/SessionBroadcast.cpp
35 sessionbroadcasttest.cpp
35 sessionbroadcasttest.cpp
36)
36)
37−qt5_use_modules(sessionbroadcasttestExec Test Core Qml DBus)
37+target_link_libraries(sessionbroadcasttestExec Qt5::Test Qt5::Core Qt5::Qml Qt5::DBus)
38install(TARGETS sessionbroadcasttestExec
38install(TARGETS sessionbroadcasttestExec
39 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/SessionBroadcast"
39 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/SessionBroadcast"
40)
40)
tests/plugins/Ubuntu/Gestures/CMakeLists.txt+4−2
@@ -18,8 +18,10 @@ include_directories(
18
18
19macro(build_gesture_test CLASSNAME)
19macro(build_gesture_test CLASSNAME)
20 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp TestItem.cpp)
20 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp TestItem.cpp)
21+ target_link_libraries(${CLASSNAME}TestExec
21− qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)
22+ Qt5::Test Qt5::Core Qt5::Qml Qt5::Gui Qt5::Quick
22− target_link_libraries(${CLASSNAME}TestExec UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
23+ UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES}
24+ )
23 install(TARGETS ${CLASSNAME}TestExec
25 install(TARGETS ${CLASSNAME}TestExec
24 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Ubuntu/Gestures"
26 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Ubuntu/Gestures"
25 )
27 )
tests/plugins/Unity/Indicators/CMakeLists.txt+1−1
@@ -17,8 +17,8 @@ macro(indicator_test TEST)
17 ${TEST}Test.cpp
17 ${TEST}Test.cpp
18 ${test_ADDITIONAL_CPPS}
18 ${test_ADDITIONAL_CPPS}
19 )
19 )
20− qt5_use_modules(${TEST}Exec Test Core Qml DBus)
21 target_link_libraries(${TEST}Exec
20 target_link_libraries(${TEST}Exec
21+ Qt5::Test Qt5::Core Qt5::Qml Qt5::DBus
22 ${test_ADDITIONAL_LIBS}
22 ${test_ADDITIONAL_LIBS}
23 ${GLIB_LIBRARIES}
23 ${GLIB_LIBRARIES}
24 ${GIO_LIBRARIES}
24 ${GIO_LIBRARIES}
tests/plugins/Unity/Launcher/CMakeLists.txt+2−2
@@ -44,9 +44,9 @@ target_link_libraries(launchermodeltestExec
44 ${GSETTINGS_QT_LDFLAGS}
44 ${GSETTINGS_QT_LDFLAGS}
45 ${GLIB_LIBRARIES}
45 ${GLIB_LIBRARIES}
46 ${UAL_LIBRARIES}
46 ${UAL_LIBRARIES}
47+ Qt5::Test Qt5::Core Qt5::DBus Qt5::Xml Qt5::Gui Qt5::Qml
47 )
48 )
48add_dependencies(launchermodeltestExec mock-server)
49add_dependencies(launchermodeltestExec mock-server)
49−qt5_use_modules(launchermodeltestExec Test Core DBus Xml Gui Qml)
50install(TARGETS launchermodeltestExec
50install(TARGETS launchermodeltestExec
51 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Launcher"
51 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Launcher"
52 )
52 )
@@ -78,9 +78,9 @@ target_link_libraries(appdrawermodeltestExec
78 ${GSETTINGS_QT_LDFLAGS}
78 ${GSETTINGS_QT_LDFLAGS}
79 ${GLIB_LIBRARIES}
79 ${GLIB_LIBRARIES}
80 ${UAL_LIBRARIES}
80 ${UAL_LIBRARIES}
81+ Qt5::Test Qt5::Core Qt5::DBus Qt5::Xml Qt5::Gui Qt5::Qml
81 )
82 )
82add_dependencies(appdrawermodeltestExec mock-server)
83add_dependencies(appdrawermodeltestExec mock-server)
83−qt5_use_modules(appdrawermodeltestExec Test Core DBus Xml Gui Qml)
84install(TARGETS appdrawermodeltestExec
84install(TARGETS appdrawermodeltestExec
85 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Launcher"
85 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Launcher"
86 )
86 )
tests/plugins/Unity/Session/CMakeLists.txt+2−2
@@ -28,7 +28,7 @@ add_executable(LightDMServer
28 LogindServer.cpp
28 LogindServer.cpp
29 server.cpp
29 server.cpp
30)
30)
31−qt5_use_modules(LightDMServer Core DBus)
31+target_link_libraries(LightDMServer Qt5::Core Qt5::DBus)
32install(TARGETS LightDMServer
32install(TARGETS LightDMServer
33 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Session"
33 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Session"
34 )
34 )
@@ -53,7 +53,7 @@ target_link_libraries(sessionbackendtestExec
53 unity8-private
53 unity8-private
54 ${GLIB_LIBRARIES}
54 ${GLIB_LIBRARIES}
55 )
55 )
56−qt5_use_modules(sessionbackendtestExec Test Core Qml DBus)
56+target_link_libraries(sessionbackendtestExec Qt5::Test Qt5::Core Qt5::Qml Qt5::DBus)
57install(TARGETS sessionbackendtestExec
57install(TARGETS sessionbackendtestExec
58 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Session"
58 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Session"
59)
59)
tests/plugins/Utils/CMakeLists.txt+2−4
@@ -16,8 +16,7 @@ foreach(util_test
16 WindowStateStorage
16 WindowStateStorage
17)
17)
18 add_executable(${util_test}TestExec ${util_test}Test.cpp ModelTest.cpp)
18 add_executable(${util_test}TestExec ${util_test}Test.cpp ModelTest.cpp)
19− qt5_use_modules(${util_test}TestExec Test Core Qml)
19+ target_link_libraries(${util_test}TestExec Qt5::Test Qt5::Core Qt5::Qml Utils-qml)
20− target_link_libraries(${util_test}TestExec Utils-qml)
21 install(TARGETS ${util_test}TestExec
20 install(TARGETS ${util_test}TestExec
22 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Utils"
21 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Utils"
23 )
22 )
@@ -32,8 +31,7 @@ add_unity8_qmlunittest(. UtilsStyle)
32
31
33# URLDispatcher test needs dbus-test-runner because it claims a dbus name
32# URLDispatcher test needs dbus-test-runner because it claims a dbus name
34add_executable(URLDispatcherTestExec URLDispatcherTest.cpp)
33add_executable(URLDispatcherTestExec URLDispatcherTest.cpp)
35−qt5_use_modules(URLDispatcherTestExec Test Core Qml)
34+target_link_libraries(URLDispatcherTestExec Qt5::Test Qt5::Core Qt5::Qml Utils-qml)
36−target_link_libraries(URLDispatcherTestExec Utils-qml)
37install(TARGETS URLDispatcherTestExec
35install(TARGETS URLDispatcherTestExec
38 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Utils"
36 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Utils"
39)
37)
tests/plugins/WindowManager/CMakeLists.txt+4−2
@@ -17,9 +17,11 @@ add_executable(TopLevelWindowModelTestExec
17 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
17 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
18 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/SurfaceManagerInterface.h
18 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/SurfaceManagerInterface.h
19 )
19 )
20−qt5_use_modules(TopLevelWindowModelTestExec Test Core Gui Qml Quick)
21
20
22−target_link_libraries(TopLevelWindowModelTestExec windowmanager-qml)
21+target_link_libraries(TopLevelWindowModelTestExec
22+ Qt5::Test Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick
23+ windowmanager-qml
24+)
23
25
24install(TARGETS TopLevelWindowModelTestExec
26install(TARGETS TopLevelWindowModelTestExec
25 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/WindowManager"
27 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/WindowManager"
tests/plugins/Wizard/CMakeLists.txt+2−2
@@ -7,7 +7,7 @@ add_executable(tst-wizard-pagelist
7 tst_pagelist.cpp
7 tst_pagelist.cpp
8 ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp
8 ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp
9)
9)
10−qt5_use_modules(tst-wizard-pagelist Core Qml Test)
10+target_link_libraries(tst-wizard-pagelist Qt5::Core Qt5::Qml Qt5::Test)
11install(TARGETS tst-wizard-pagelist
11install(TARGETS tst-wizard-pagelist
12 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Wizard"
12 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Wizard"
13)
13)
@@ -17,7 +17,7 @@ add_executable(tst-wizard-system
17 tst_system.cpp
17 tst_system.cpp
18 ${CMAKE_SOURCE_DIR}/plugins/Wizard/System.cpp
18 ${CMAKE_SOURCE_DIR}/plugins/Wizard/System.cpp
19)
19)
20−qt5_use_modules(tst-wizard-system Core DBus Qml Test)
20+target_link_libraries(tst-wizard-system Qt5::Core Qt5::DBus Qt5::Qml Qt5::Test)
21install(TARGETS tst-wizard-system
21install(TARGETS tst-wizard-system
22 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Wizard"
22 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Wizard"
23)
23)
tests/qmltests/Components/CMakeLists.txt+8−4
@@ -18,8 +18,10 @@ include_directories(
18 )
18 )
19
19
20add_executable(DragHandleTestExec tst_DragHandle.cpp)
20add_executable(DragHandleTestExec tst_DragHandle.cpp)
21+target_link_libraries(DragHandleTestExec
21−qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)
22+ Qt5::Test Qt5::Core Qt5::Qml Qt5::Gui Qt5::Quick
22−target_link_libraries(DragHandleTestExec UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
23+ UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES}
24+ )
23install(TARGETS DragHandleTestExec
25install(TARGETS DragHandleTestExec
24 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/qmltests/Components"
26 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/qmltests/Components"
25 )
27 )
@@ -34,8 +36,10 @@ add_unity8_qmltest_data(. tst_DragHandle)
34
36
35########## tst_EdgeDragEvaluator
37########## tst_EdgeDragEvaluator
36add_executable(EdgeDragEvaluatorTestExec tst_EdgeDragEvaluator.cpp)
38add_executable(EdgeDragEvaluatorTestExec tst_EdgeDragEvaluator.cpp)
37−qt5_use_modules(EdgeDragEvaluatorTestExec Test Core Qml Gui Quick)
39+target_link_libraries(EdgeDragEvaluatorTestExec
40+ Qt5::Test Qt5::Core Qt5::Qml Qt5::Gui Qt5::Quick
38−target_link_libraries(EdgeDragEvaluatorTestExec UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
41+ UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES}
42+ )
39install(TARGETS EdgeDragEvaluatorTestExec
43install(TARGETS EdgeDragEvaluatorTestExec
40 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/qmltests/Components"
44 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/qmltests/Components"
41 )
45 )
tests/uqmlscene/CMakeLists.txt+1−1
@@ -4,7 +4,6 @@ add_executable(uqmlscene
4 ${CMAKE_SOURCE_DIR}/src/DebuggingController.cpp
4 ${CMAKE_SOURCE_DIR}/src/DebuggingController.cpp
5 )
5 )
6
6
7−qt5_use_modules(uqmlscene Qml Quick Test DBus)
8pkg_check_modules(XCB REQUIRED xcb)
7pkg_check_modules(XCB REQUIRED xcb)
9
8
10include_directories(
9include_directories(
@@ -25,6 +24,7 @@ if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
25endif()
24endif()
26
25
27target_link_libraries(uqmlscene
26target_link_libraries(uqmlscene
27+ Qt5::Qml Qt5::Quick Qt5::Test Qt5::DBus
28 ${Qt5Qml_LIBRARIES}
28 ${Qt5Qml_LIBRARIES}
29 ${Qt5Quick_LIBRARIES}
29 ${Qt5Quick_LIBRARIES}
30 ${XCB_LDFLAGS}
30 ${XCB_LDFLAGS}
tests/utils/modules/Unity/Test/CMakeLists.txt+1−3
@@ -27,7 +27,7 @@ if (ENABLE_TOUCH_EMULATION)
27endif()
27endif()
28
28
29add_library(UnityTestQml MODULE ${UnityTestQML_SOURCES})
29add_library(UnityTestQml MODULE ${UnityTestQML_SOURCES})
30−target_link_libraries(UnityTestQml ${UBUNTUGESTURES_LIBRARIES})
30+target_link_libraries(UnityTestQml ${UBUNTUGESTURES_LIBRARIES} Qt5::Core Qt5::Quick Qt5::Test)
31
31
32if (ENABLE_TOUCH_EMULATION)
32if (ENABLE_TOUCH_EMULATION)
33 target_link_libraries(UnityTestQml ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
33 target_link_libraries(UnityTestQml ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
@@ -36,6 +36,4 @@ endif()
36# To find libUbuntuGestures.so
36# To find libUbuntuGestures.so
37set_target_properties(UnityTestQml PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
37set_target_properties(UnityTestQml PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
38
38
39−qt5_use_modules(UnityTestQml Core Quick Test)
40−
41add_unity8_mock(Unity.Test 0.1 Unity/Test PREFIX utils TARGETS UnityTestQml)
39add_unity8_mock(Unity.Test 0.1 Unity/Test PREFIX utils TARGETS UnityTestQml)
tools/indicatorsclient/CMakeLists.txt+1−1
@@ -13,7 +13,7 @@ add_executable(${INDICATORS_CLIENT_APP}
13 ${INDICATORS_CLIENT_HEADERS}
13 ${INDICATORS_CLIENT_HEADERS}
14)
14)
15
15
16−qt5_use_modules(${INDICATORS_CLIENT_APP} Core Widgets Quick)
16+target_link_libraries(${INDICATORS_CLIENT_APP} Qt5::Core Qt5::Widgets Qt5::Quick)
17
17
18install(TARGETS ${INDICATORS_CLIENT_APP}
18install(TARGETS ${INDICATORS_CLIENT_APP}
19 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
19 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
tools/menutool/CMakeLists.txt+1−1
@@ -2,4 +2,4 @@ add_executable(menutool
2 menutool.cpp
2 menutool.cpp
3 )
3 )
4
4
5−qt5_use_modules(menutool Qml Quick)
5+target_link_libraries(menutool Qt5::Qml Qt5::Quick)
tools/scopetool/CMakeLists.txt+1−1
@@ -4,7 +4,7 @@ add_executable(${SCOPE_TOOL}
4 ../../src/UnixSignalHandler.cpp
4 ../../src/UnixSignalHandler.cpp
5 )
5 )
6
6
7−qt5_use_modules(${SCOPE_TOOL} Qml Quick)
7+target_link_libraries(${SCOPE_TOOL} Qt5::Qml Qt5::Quick)
8
8
9# install binaries
9# install binaries
10install(TARGETS ${SCOPE_TOOL}
10install(TARGETS ${SCOPE_TOOL}