1
=== renamed file 'cmake/modules/Plugins.cmake' => 'cmake/modules/QmlPlugins.cmake'
2
--- cmake/modules/Plugins.cmake	2014-01-29 18:16:53 +0000
3
+++ cmake/modules/QmlPlugins.cmake	2014-05-15 15:00:34 +0000
4
@@ -1,68 +1,143 @@
9
1
find_program(qmlplugindump_exe qmlplugindump)
1
# If you need to override the qmlplugindump binary, create the qmlplugin executable
10
2
2
# target before loading this plugin.
11
3
if(NOT qmlplugindump_exe)
3
12
4
  msg(FATAL_ERROR "Could not locate qmlplugindump.")
4
if(NOT TARGET qmlplugindump)
13
5
    find_program(qmlplugindump_exe qmlplugindump)
14
6
15
7
    if(NOT qmlplugindump_exe)
16
8
      msg(FATAL_ERROR "Could not locate qmlplugindump.")
17
9
    endif()
18
10
19
11
    add_executable(qmlplugindump IMPORTED)
20
12
    set_target_properties(qmlplugindump PROPERTIES IMPORTED_LOCATION ${qmlplugindump_exe})
21
5
endif()
13
endif()
22
6
14
32
7
# Creates target for copying and installing qmlfiles
15
33
8
#
16
# Creates a target for copying resource files into build dir and optionally installing them.
34
9
# export_qmlfiles(plugin sub_path)
17
#
35
10
#
18
# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
36
11
#
19
# into ${DESTINATION}/${path}.
37
12
# Target to be created:
20
#
38
13
#   - plugin-qmlfiles - Copies the qml files (*.qml, *.js, qmldir) into the shadow build folder.
21
# Resource file names are matched against {*.{qml,js,jpg,png,sci,svg},qmldir}.
39
14
22
#
40
15
macro(export_qmlfiles PLUGIN PLUGIN_SUBPATH)
23
# export_qmlfiles(plugin path
41
24
#     [SEARCH_PATH path]      # Path to search for resources in (defaults to ${CMAKE_CURRENT_SOURCE_DIR})
42
25
#     [BINARY_DIR path]
43
26
#     [DESTINATION path]
44
27
#     [TARGET_PREFIX string]  # Will be prefixed to the target name
45
28
# )
46
29
#
47
30
# Created target:
48
31
#   - ${TARGET_PREFIX}${plugin}-qmlfiles - Copies resources into the binary dir.
49
32
50
33
macro(export_qmlfiles PLUGIN PATH)
51
34
    set(single SEARCH_PATH BINARY_DIR DESTINATION TARGET_PREFIX)
52
35
    cmake_parse_arguments(QMLFILES "" "${single}" "" ${ARGN})
53
36
 
54
37
    if(NOT QMLFILES_SEARCH_PATH)
55
38
        set(QMLFILES_SEARCH_PATH ${CMAKE_CURRENT_SOURCE_DIR})
56
39
    endif()
57
40
58
41
    if(QMLFILES_BINARY_DIR)
59
42
        set(qmlfiles_dir ${QMLFILES_BINARY_DIR}/${PATH})
60
43
    else()
61
44
        set(qmlfiles_dir ${CMAKE_CURRENT_BINARY_DIR})
62
45
    endif()
63
16
46
64
17
    file(GLOB QMLFILES
47
    file(GLOB QMLFILES
68
18
        *.qml
48
        ${QMLFILES_SEARCH_PATH}/*.qml
69
19
        *.js
49
        ${QMLFILES_SEARCH_PATH}/*.js
70
20
        qmldir
50
        ${QMLFILES_SEARCH_PATH}/*.jpg
71
51
        ${QMLFILES_SEARCH_PATH}/*.png
72
52
        ${QMLFILES_SEARCH_PATH}/*.sci
73
53
        ${QMLFILES_SEARCH_PATH}/*.svg
74
54
        ${QMLFILES_SEARCH_PATH}/qmldir
75
21
    )
55
    )
76
22
56
80
23
    # copy the qmldir file
57
    execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${qmlfiles_dir})
81
24
    add_custom_target(${PLUGIN}-qmlfiles ALL
58
82
25
                        COMMAND cp ${QMLFILES} ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}
59
    # copy the files
83
60
    add_custom_target(${QMLFILES_TARGET_PREFIX}${PLUGIN}-qmlfiles ALL
84
61
                        COMMAND cp ${QMLFILES} ${qmlfiles_dir}
85
26
                        DEPENDS ${QMLFILES}
62
                        DEPENDS ${QMLFILES}
86
27
                        SOURCES ${QMLFILES}
63
                        SOURCES ${QMLFILES}
87
28
    )
64
    )
88
29
65
93
30
    # install the qmlfiles file.
66
    if(QMLFILES_DESTINATION)
94
31
    install(FILES ${QMLFILES}
67
        # install the qmlfiles file.
95
32
        DESTINATION ${SHELL_INSTALL_QML}/${PLUGIN_SUBPATH}
68
        install(FILES ${QMLFILES}
96
33
    )
69
            DESTINATION ${QMLFILES_DESTINATION}/${PATH}
97
70
        )
98
71
    endif()
99
34
endmacro(export_qmlfiles)
72
endmacro(export_qmlfiles)
100
35
73
101
36
74
116
37
# Creates target for generating the qmltypes file for a plugin and installs plugin files
75
# Creates a target for generating the typeinfo file for a QML plugin and optionally installs it
117
38
#
76
# and additional targets.
118
39
# export_qmlplugin(plugin version sub_path [TARGETS target1 [target2 ...]])
77
#
119
40
#
78
# Files will be copied into ${BINARY_DIR}/${path} or ${CMAKE_CURRENT_BINARY_DIR} and installed
120
41
# TARGETS additional install targets (eg the plugin shared object)
79
# into ${DESTINATION}/${path}. If you don't pass BINARY_DIR, it's  assumed that current source
121
42
#
80
# path ends with ${path}.
122
43
# Target to be created:
81
#
123
44
#   - plugin-qmltypes - Generates the qmltypes file in the shadow build folder.
82
# The generated file will be named after the last segment of the plugin name, e.g. Foo.qmltypes.
124
45
83
#
125
46
macro(export_qmlplugin PLUGIN VERSION PLUGIN_SUBPATH)
84
# export_qmlplugin(plugin version path
126
47
    set(multi_value_keywords TARGETS)
85
#     [BINARY_DIR path]
127
48
    cmake_parse_arguments(qmlplugin "" "" "${multi_value_keywords}" ${ARGN})
86
#     [DESTINATION path]
128
49
87
#     [TARGET_PREFIX string]  # Will be prefixed to the target name
129
50
    # Only try to generate .qmltypes if not cross compiling
88
#     [ENVIRONMENT string]    # Will be added to qmlplugindump's env
130
89
#     [TARGETS target1 [target2 ...]] # Targets to depend on and install (e.g. the plugin shared object)
131
90
# )
132
91
#
133
92
# Created target:
134
93
#   - ${TARGET_PREFIX}${plugin}-qmltypes - Generates the qmltypes file in the binary dir.
135
94
136
95
macro(export_qmlplugin PLUGIN VERSION PATH)
137
96
    set(single BINARY_DIR DESTINATION TARGET_PREFIX ENVIRONMENT)
138
97
    set(multi TARGETS)
139
98
    cmake_parse_arguments(QMLPLUGIN "" "${single}" "${multi}" ${ARGN})
140
99
141
100
    get_target_property(qmlplugindump_executable qmlplugindump LOCATION)
142
101
143
102
    if(QMLPLUGIN_BINARY_DIR)
144
103
        set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
145
104
    else()
146
105
        # Find import path to point qmlplugindump at
147
106
        string(REGEX REPLACE "${PATH}$" "" QMLPLUGIN_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
148
107
        set(qmlplugin_dir ${CMAKE_CURRENT_BINARY_DIR})
149
108
    endif()
150
109
151
110
    # Find the last segment of the plugin name to use as qmltypes basename
152
111
    string(REGEX MATCH "[^.]+$" plugin_suffix ${PLUGIN})
153
112
    set(target_prefix ${QMLPLUGIN_TARGET_PREFIX}${PLUGIN})
154
113
    set(qmltypes_path ${qmlplugin_dir}/${plugin_suffix}.qmltypes)
155
114
156
115
    # Only generate typeinfo if not cross compiling
157
51
    if(NOT CMAKE_CROSSCOMPILING)
116
    if(NOT CMAKE_CROSSCOMPILING)
161
52
        # create the plugin.qmltypes file
117
        add_custom_target(${target_prefix}-qmltypes ALL
162
53
        add_custom_target(${PLUGIN}-qmltypes ALL
118
            COMMAND env ${QMLPLUGIN_ENVIRONMENT} ${qmlplugindump_executable} -notrelocatable
163
54
            COMMAND ${qmlplugindump_exe} -notrelocatable ${PLUGIN} ${VERSION} ${CMAKE_BINARY_DIR}/plugins > ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
119
                    ${PLUGIN} ${VERSION} ${QMLPLUGIN_BINARY_DIR} > ${qmltypes_path}
164
55
        )
120
        )
166
56
        add_dependencies(${PLUGIN}-qmltypes ${PLUGIN}-qmlfiles ${qmlplugin_TARGETS})
121
        add_dependencies(${target_prefix}-qmltypes ${target_prefix}-qmlfiles ${QMLPLUGIN_TARGETS})
167
57
122
172
58
        # install the qmltypes file.
123
        if (QMLPLUGIN_DESTINATION)
173
59
        install(FILES ${CMAKE_BINARY_DIR}/plugins/${PLUGIN_SUBPATH}/plugin.qmltypes
124
            # Install the typeinfo file
174
60
            DESTINATION ${SHELL_INSTALL_QML}/${PLUGIN_SUBPATH}
125
            install(FILES ${qmltypes_path}
175
61
        )
126
                    DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
176
127
            )
177
128
        endif()
178
62
    endif()
129
    endif()
179
63
130
183
64
    # install the additional targets
131
    set_target_properties(${QMLPLUGIN_TARGETS} PROPERTIES
184
65
    install(TARGETS ${qmlplugin_TARGETS}
132
                          ARCHIVE_OUTPUT_DIRECTORY ${qmlplugin_dir}
185
66
        DESTINATION ${SHELL_INSTALL_QML}/${PLUGIN_SUBPATH}
133
                          LIBRARY_OUTPUT_DIRECTORY ${qmlplugin_dir}
186
134
                          RUNTIME_OUTPUT_DIRECTORY ${qmlplugin_dir}
187
67
    )
135
    )
189
68
endmacro(export_qmlplugin)
136
190
137
    if (QMLPLUGIN_DESTINATION)
191
138
        # Install additional targets
192
139
        install(TARGETS ${QMLPLUGIN_TARGETS}
193
140
                DESTINATION ${QMLPLUGIN_DESTINATION}/${PATH}
194
141
        )
195
142
    endif()
196
143
endmacro()
197
69
144
198
=== modified file 'plugins/AccountsService/CMakeLists.txt'
199
--- plugins/AccountsService/CMakeLists.txt	2013-09-05 18:09:41 +0000
200
+++ plugins/AccountsService/CMakeLists.txt	2014-05-15 15:00:34 +0000
201
@@ -1,5 +1,3 @@
202
1
include(Plugins)
203
2
204
3
add_definitions(-DSM_BUSNAME=systemBus)
1
add_definitions(-DSM_BUSNAME=systemBus)
205
4
2
206
5
add_library(AccountsService-qml MODULE
3
add_library(AccountsService-qml MODULE
207
@@ -10,8 +8,7 @@
208
10
8
209
11
qt5_use_modules(AccountsService-qml DBus Qml)
9
qt5_use_modules(AccountsService-qml DBus Qml)
210
12
10
213
13
export_qmlfiles(AccountsService AccountsService)
11
add_unity8_plugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)
212
14
export_qmlplugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)
214
15
12
215
16
set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
13
set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
216
17
set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1")
14
set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1")
217
18
15
218
=== modified file 'plugins/AccountsService/qmldir'
219
--- plugins/AccountsService/qmldir	2013-07-24 18:29:21 +0000
220
+++ plugins/AccountsService/qmldir	2014-05-15 15:00:34 +0000
221
@@ -1,3 +1,3 @@
222
1
module AccountsService
1
module AccountsService
223
2
plugin AccountsService-qml
2
plugin AccountsService-qml
225
3
typeinfo plugin.qmltypes
3
typeinfo AccountsService.qmltypes
226
4
4
227
=== modified file 'plugins/CMakeLists.txt'
228
--- plugins/CMakeLists.txt	2014-04-30 10:06:33 +0000
229
+++ plugins/CMakeLists.txt	2014-05-15 15:00:34 +0000
230
@@ -1,3 +1,16 @@
231
1
include(QmlPlugins)
232
2
233
3
# Set up and install a plugin for unity8.
234
4
#
235
5
# add_unity8_plugin(plugin version path
236
6
#     [...]  # See export_qmlfiles and export_qmlplugin documentation for more options
237
7
# )
238
8
239
9
macro(add_unity8_plugin PLUGIN VERSION PATH)
240
10
    export_qmlfiles(${PLUGIN} ${PATH} DESTINATION ${SHELL_INSTALL_QML} ${ARGN})
241
11
    export_qmlplugin(${PLUGIN} ${VERSION} ${PATH} DESTINATION ${SHELL_INSTALL_QML} ${ARGN})
242
12
endmacro()
243
13
244
1
add_subdirectory(AccountsService)
14
add_subdirectory(AccountsService)
245
2
add_subdirectory(HudClient)
15
add_subdirectory(HudClient)
246
3
add_subdirectory(LightDM)
16
add_subdirectory(LightDM)
247
4
17
248
=== modified file 'plugins/Dash/CMakeLists.txt'
249
--- plugins/Dash/CMakeLists.txt	2014-04-30 10:06:33 +0000
250
+++ plugins/Dash/CMakeLists.txt	2014-05-15 15:00:34 +0000
251
@@ -1,6 +1,3 @@
252
1
# export_qmlplugin macro
253
2
include(Plugins)
254
3
255
4
# There's no cmake var for v8 include path :-/
1
# There's no cmake var for v8 include path :-/
256
5
# so create one
2
# so create one
257
6
LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
3
LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
258
@@ -41,6 +38,4 @@
259
41
38
260
42
qt5_use_modules(Dash-qml Qml Quick)
39
qt5_use_modules(Dash-qml Qml Quick)
261
43
40
265
44
# export the qmldir qmltypes and plugin files
41
add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
263
45
export_qmlfiles(Dash Dash)
264
46
export_qmlplugin(Dash 0.1 Dash TARGETS Dash-qml)
266
47
42
267
=== modified file 'plugins/Dash/qmldir'
268
--- plugins/Dash/qmldir	2014-04-30 10:06:33 +0000
269
+++ plugins/Dash/qmldir	2014-05-15 15:00:34 +0000
270
@@ -1,4 +1,4 @@
271
1
module Dash
1
module Dash
272
2
plugin Dash-qml
2
plugin Dash-qml
274
3
typeinfo plugin.qmltypes
3
typeinfo Dash.qmltypes
275
4
singleton CardCreatorCache 0.1 CardCreatorCache.qml
4
singleton CardCreatorCache 0.1 CardCreatorCache.qml
276
5
5
277
=== modified file 'plugins/HudClient/CMakeLists.txt'
278
--- plugins/HudClient/CMakeLists.txt	2013-07-08 15:12:28 +0000
279
+++ plugins/HudClient/CMakeLists.txt	2014-05-15 15:00:34 +0000
280
@@ -1,6 +1,3 @@
281
1
# export_qmlplugin macro
282
2
include(Plugins)
283
3
284
4
find_package(Qt5Core REQUIRED)
1
find_package(Qt5Core REQUIRED)
285
5
find_package(Qt5Quick REQUIRED)
2
find_package(Qt5Quick REQUIRED)
286
6
pkg_search_module(DEE dee-1.0 REQUIRED)
3
pkg_search_module(DEE dee-1.0 REQUIRED)
287
@@ -38,6 +35,4 @@
288
38
35
289
39
qt5_use_modules(HudClientQml Qml)
36
qt5_use_modules(HudClientQml Qml)
290
40
37
294
41
# export the qmldir qmltypes and plugin files
38
add_unity8_plugin(HudClient 0.1 HudClient TARGETS HudClientQml)
292
42
export_qmlfiles(HudClient HudClient)
293
43
export_qmlplugin(HudClient 0.1 HudClient TARGETS HudClientQml)
295
44
39
296
=== modified file 'plugins/HudClient/qmldir'
297
--- plugins/HudClient/qmldir	2013-08-22 12:38:53 +0000
298
+++ plugins/HudClient/qmldir	2014-05-15 15:00:34 +0000
299
@@ -1,3 +1,3 @@
300
1
module HudClient
1
module HudClient
301
2
plugin HudClientQml
2
plugin HudClientQml
303
3
typeinfo plugin.qmltypes
3
typeinfo HudClient.qmltypes
304
4
4
305
=== modified file 'plugins/LightDM/CMakeLists.txt'
306
--- plugins/LightDM/CMakeLists.txt	2013-12-17 14:56:25 +0000
307
+++ plugins/LightDM/CMakeLists.txt	2014-05-15 15:00:34 +0000
308
@@ -1,6 +1,3 @@
309
1
# export_qmlplugin macro
310
2
include(Plugins)
311
3
312
4
# Dependencies
1
# Dependencies
313
5
include(FindPkgConfig)
2
include(FindPkgConfig)
314
6
pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
3
pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
315
@@ -37,6 +34,4 @@
316
37
34
317
38
qt5_use_modules(LightDM-qml DBus Gui Qml)
35
qt5_use_modules(LightDM-qml DBus Gui Qml)
318
39
36
322
40
# export the qmldir qmltypes and plugin files
37
add_unity8_plugin(LightDM 0.1 LightDM TARGETS LightDM-qml)
320
41
export_qmlfiles(LightDM LightDM)
321
42
export_qmlplugin(LightDM 0.1 LightDM TARGETS LightDM-qml)
323
43
38
324
=== modified file 'plugins/LightDM/qmldir'
325
--- plugins/LightDM/qmldir	2013-07-04 09:32:44 +0000
326
+++ plugins/LightDM/qmldir	2014-05-15 15:00:34 +0000
327
@@ -1,3 +1,3 @@
328
1
module LightDM
1
module LightDM
329
2
plugin LightDM-qml
2
plugin LightDM-qml
331
3
typeinfo plugin.qmltypes
3
typeinfo LightDM.qmltypes
332
4
4
333
=== modified file 'plugins/Powerd/CMakeLists.txt'
334
--- plugins/Powerd/CMakeLists.txt	2014-03-26 17:54:40 +0000
335
+++ plugins/Powerd/CMakeLists.txt	2014-05-15 15:00:34 +0000
336
@@ -1,4 +1,3 @@
337
1
include(Plugins)
338
2
include(FindPkgConfig)
1
include(FindPkgConfig)
339
3
2
340
4
pkg_search_module(GIO REQUIRED gio-2.0)
3
pkg_search_module(GIO REQUIRED gio-2.0)
341
@@ -17,5 +16,4 @@
342
17
qt5_use_modules(Powerd-qml DBus Qml)
16
qt5_use_modules(Powerd-qml DBus Qml)
343
18
target_link_libraries(Powerd-qml ${GIO_LDFLAGS})
17
target_link_libraries(Powerd-qml ${GIO_LDFLAGS})
344
19
18
347
20
export_qmlfiles(Powerd Powerd)
19
add_unity8_plugin(Powerd 0.1 Powerd TARGETS Powerd-qml)
346
21
export_qmlplugin(Powerd 0.1 Powerd TARGETS Powerd-qml)
348
22
20
349
=== modified file 'plugins/Powerd/qmldir'
350
--- plugins/Powerd/qmldir	2013-08-02 16:18:28 +0000
351
+++ plugins/Powerd/qmldir	2014-05-15 15:00:34 +0000
352
@@ -1,3 +1,3 @@
353
1
module Powerd
1
module Powerd
354
2
plugin Powerd-qml
2
plugin Powerd-qml
356
3
typeinfo plugin.qmltypes
3
typeinfo Powerd.qmltypes
357
4
4
358
=== modified file 'plugins/SessionBroadcast/CMakeLists.txt'
359
--- plugins/SessionBroadcast/CMakeLists.txt	2013-09-12 17:58:21 +0000
360
+++ plugins/SessionBroadcast/CMakeLists.txt	2014-05-15 15:00:34 +0000
361
@@ -1,5 +1,3 @@
362
1
include(Plugins)
363
2
364
3
add_definitions(-DSM_BUSNAME=systemBus)
1
add_definitions(-DSM_BUSNAME=systemBus)
365
4
2
366
5
add_library(SessionBroadcast-qml MODULE
3
add_library(SessionBroadcast-qml MODULE
367
@@ -9,5 +7,4 @@
368
9
7
369
10
qt5_use_modules(SessionBroadcast-qml DBus Qml)
8
qt5_use_modules(SessionBroadcast-qml DBus Qml)
370
11
9
373
12
export_qmlfiles(SessionBroadcast SessionBroadcast)
10
add_unity8_plugin(SessionBroadcast 0.1 SessionBroadcast TARGETS SessionBroadcast-qml)
372
13
export_qmlplugin(SessionBroadcast 0.1 SessionBroadcast TARGETS SessionBroadcast-qml)
374
14
11
375
=== modified file 'plugins/SessionBroadcast/qmldir'
376
--- plugins/SessionBroadcast/qmldir	2013-09-12 17:58:21 +0000
377
+++ plugins/SessionBroadcast/qmldir	2014-05-15 15:00:34 +0000
378
@@ -1,3 +1,3 @@
379
1
module SessionBroadcast
1
module SessionBroadcast
380
2
plugin SessionBroadcast-qml
2
plugin SessionBroadcast-qml
382
3
typeinfo plugin.qmltypes
3
typeinfo SessionBroadcast.qmltypes
383
4
4
384
=== modified file 'plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt'
385
--- plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt	2013-08-13 08:49:52 +0000
386
+++ plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt	2014-05-15 15:00:34 +0000
387
@@ -1,6 +1,3 @@
388
1
# export_qmlplugin macro
389
2
include(Plugins)
390
3
391
4
include_directories(
1
include_directories(
392
5
    ${CMAKE_CURRENT_SOURCE_DIR}
2
    ${CMAKE_CURRENT_SOURCE_DIR}
393
6
    ${CMAKE_CURRENT_BINARY_DIR}
3
    ${CMAKE_CURRENT_BINARY_DIR}
394
@@ -17,6 +14,4 @@
395
17
14
396
18
qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
15
qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
397
19
16
401
20
# export the qmldir qmltypes and plugin files
17
add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
399
21
export_qmlfiles(Ubuntu.DownloadDaemonListener Ubuntu/DownloadDaemonListener)
400
22
export_qmlplugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
402
23
18
403
=== modified file 'plugins/Ubuntu/DownloadDaemonListener/qmldir'
404
--- plugins/Ubuntu/DownloadDaemonListener/qmldir	2013-07-24 14:18:23 +0000
405
+++ plugins/Ubuntu/DownloadDaemonListener/qmldir	2014-05-15 15:00:34 +0000
406
@@ -1,3 +1,3 @@
407
1
module Ubuntu.DownloadDaemonListener
1
module Ubuntu.DownloadDaemonListener
408
2
plugin DownloadDaemonListener
2
plugin DownloadDaemonListener
410
3
typeinfo plugins.qmltypes
3
typeinfo DownloadDaemonListener.qmltypes
411
4
4
412
=== modified file 'plugins/Ubuntu/Gestures/CMakeLists.txt'
413
--- plugins/Ubuntu/Gestures/CMakeLists.txt	2013-11-22 13:43:40 +0000
414
+++ plugins/Ubuntu/Gestures/CMakeLists.txt	2014-05-15 15:00:34 +0000
415
@@ -1,6 +1,3 @@
416
1
# export_qmlplugin macro
417
2
include(Plugins)
418
3
419
4
set(UbuntuGestureQml_SOURCES
1
set(UbuntuGestureQml_SOURCES
420
5
    plugin.cpp
2
    plugin.cpp
421
6
    AxisVelocityCalculator.cpp
3
    AxisVelocityCalculator.cpp
422
@@ -19,6 +16,4 @@
423
19
# So that Foo.cpp can #include "Foo.moc"
16
# So that Foo.cpp can #include "Foo.moc"
424
20
include_directories(${CMAKE_CURRENT_BINARY_DIR})
17
include_directories(${CMAKE_CURRENT_BINARY_DIR})
425
21
18
429
22
# export the qmldir qmltypes and plugin files
19
add_unity8_plugin(Ubuntu.Gestures 0.1 Ubuntu/Gestures TARGETS UbuntuGestureQml)
427
23
export_qmlfiles(Ubuntu.Gestures Ubuntu/Gestures)
428
24
export_qmlplugin(Ubuntu.Gestures 0.1 Ubuntu/Gestures TARGETS UbuntuGestureQml)
430
25
20
431
=== modified file 'plugins/Ubuntu/Gestures/qmldir'
432
--- plugins/Ubuntu/Gestures/qmldir	2013-07-04 09:32:44 +0000
433
+++ plugins/Ubuntu/Gestures/qmldir	2014-05-15 15:00:34 +0000
434
@@ -1,3 +1,3 @@
435
1
module Ubuntu.Gestures
1
module Ubuntu.Gestures
436
2
plugin UbuntuGestureQml
2
plugin UbuntuGestureQml
438
3
typeinfo plugin.qmltypes
3
typeinfo Gestures.qmltypes
439
4
4
440
=== modified file 'plugins/Unity/Indicators/CMakeLists.txt'
441
--- plugins/Unity/Indicators/CMakeLists.txt	2014-04-09 14:51:09 +0000
442
+++ plugins/Unity/Indicators/CMakeLists.txt	2014-05-15 15:00:34 +0000
443
@@ -1,6 +1,3 @@
444
1
# export_qmlplugin macro
445
2
include(Plugins)
446
3
447
4
project(IndicatorsQml)
1
project(IndicatorsQml)
448
5
2
449
6
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
3
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
450
@@ -10,8 +7,6 @@
451
10
find_package(Qt5Core REQUIRED)
7
find_package(Qt5Core REQUIRED)
452
11
find_package(Qt5Quick REQUIRED)
8
find_package(Qt5Quick REQUIRED)
453
12
9
454
13
add_subdirectory(qml)
455
14
456
15
include_directories(
10
include_directories(
457
16
    ${CMAKE_CURRENT_SOURCE_DIR}
11
    ${CMAKE_CURRENT_SOURCE_DIR}
458
17
    ${CMAKE_CURRENT_BINARY_DIR}
12
    ${CMAKE_CURRENT_BINARY_DIR}
459
@@ -56,5 +51,7 @@
460
56
51
461
57
qt5_use_modules(IndicatorsQml Core Qml Quick)
52
qt5_use_modules(IndicatorsQml Core Qml Quick)
462
58
53
465
59
# export the qmltypes and plugin files
54
add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators
466
60
export_qmlplugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)
55
    SEARCH_PATH qml
467
56
    TARGETS IndicatorsQml
468
57
)
469
61
58
470
=== removed file 'plugins/Unity/Indicators/qml/CMakeLists.txt'
471
--- plugins/Unity/Indicators/qml/CMakeLists.txt	2013-07-08 15:12:28 +0000
472
+++ plugins/Unity/Indicators/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
473
@@ -1,5 +0,0 @@
474
1
# export_qmlplugin macro
475
2
include(Plugins)
476
3
477
4
# export the qmldir, *.qml files.
478
5
export_qmlfiles(Unity.Indicators Unity/Indicators)
479
6
0
480
=== modified file 'plugins/Unity/Indicators/qml/qmldir'
481
--- plugins/Unity/Indicators/qml/qmldir	2013-12-18 09:44:19 +0000
482
+++ plugins/Unity/Indicators/qml/qmldir	2014-05-15 15:00:34 +0000
483
@@ -1,6 +1,6 @@
484
1
module Unity.Indicators
1
module Unity.Indicators
485
2
plugin IndicatorsQml
2
plugin IndicatorsQml
487
3
typeinfo plugin.qmltypes
3
typeinfo Indicators.qmltypes
488
4
4
489
5
CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
5
CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
490
6
IndicatorBase 0.1 IndicatorBase.qml
6
IndicatorBase 0.1 IndicatorBase.qml
491
7
7
492
=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
493
--- plugins/Unity/Launcher/CMakeLists.txt	2013-09-12 12:29:56 +0000
494
+++ plugins/Unity/Launcher/CMakeLists.txt	2014-05-15 15:00:34 +0000
495
@@ -32,6 +32,4 @@
496
32
32
497
33
qt5_use_modules(UnityLauncher-qml DBus Qml)
33
qt5_use_modules(UnityLauncher-qml DBus Qml)
498
34
34
502
35
# export the qmldir and qmltypes files
35
add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
500
36
export_qmlfiles(Unity.Launcher Unity/Launcher)
501
37
export_qmlplugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
503
38
36
504
=== modified file 'plugins/Unity/Launcher/qmldir'
505
--- plugins/Unity/Launcher/qmldir	2013-07-16 08:32:38 +0000
506
+++ plugins/Unity/Launcher/qmldir	2014-05-15 15:00:34 +0000
507
@@ -1,3 +1,3 @@
508
1
module Unity.Launcher
1
module Unity.Launcher
509
2
plugin UnityLauncher-qml
2
plugin UnityLauncher-qml
511
3
typeinfo plugin.qmltypes
3
typeinfo Launcher.qmltypes
512
4
4
513
=== modified file 'plugins/Utils/CMakeLists.txt'
514
--- plugins/Utils/CMakeLists.txt	2014-05-07 08:27:59 +0000
515
+++ plugins/Utils/CMakeLists.txt	2014-05-15 15:00:34 +0000
516
@@ -33,6 +33,4 @@
517
33
33
518
34
qt5_use_modules(Utils-qml Qml Quick DBus Network XmlPatterns Gui Concurrent)
34
qt5_use_modules(Utils-qml Qml Quick DBus Network XmlPatterns Gui Concurrent)
519
35
35
523
36
# export the qmldir qmltypes and plugin files
36
add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)
521
37
export_qmlfiles(Utils Utils)
522
38
export_qmlplugin(Utils 0.1 Utils TARGETS Utils-qml)
524
39
37
525
=== modified file 'plugins/Utils/qmldir'
526
--- plugins/Utils/qmldir	2013-07-04 09:32:44 +0000
527
+++ plugins/Utils/qmldir	2014-05-15 15:00:34 +0000
528
@@ -1,3 +1,3 @@
529
1
module Utils
1
module Utils
530
2
plugin Utils-qml
2
plugin Utils-qml
532
3
typeinfo plugin.qmltypes
3
typeinfo Utils.qmltypes
533
4
4
534
=== modified file 'tests/mocks/AccountsService/CMakeLists.txt'
535
--- tests/mocks/AccountsService/CMakeLists.txt	2013-11-25 17:26:15 +0000
536
+++ tests/mocks/AccountsService/CMakeLists.txt	2014-05-15 15:00:34 +0000
537
@@ -7,15 +7,4 @@
538
7
7
539
8
qt5_use_modules(MockAccountsService-qml DBus Qml)
8
qt5_use_modules(MockAccountsService-qml DBus Qml)
540
9
9
553
10
# copy files into build directory for shadow builds
10
add_unity8_mock(AccountsService 0.1 AccountsService TARGETS MockAccountsService-qml)
542
11
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
543
12
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
544
13
    )
545
14
546
15
install(TARGETS MockAccountsService-qml
547
16
    DESTINATION ${SHELL_INSTALL_QML}/mocks/AccountsService
548
17
    )
549
18
550
19
install(FILES qmldir
551
20
    DESTINATION ${SHELL_INSTALL_QML}/mocks/AccountsService
552
21
    )
554
22
11
555
=== modified file 'tests/mocks/AccountsService/qmldir'
556
--- tests/mocks/AccountsService/qmldir	2013-08-12 19:08:02 +0000
557
+++ tests/mocks/AccountsService/qmldir	2014-05-15 15:00:34 +0000
558
@@ -1,2 +1,3 @@
559
1
module AccountsService
1
module AccountsService
560
2
plugin MockAccountsService-qml
2
plugin MockAccountsService-qml
561
3
typeinfo AccountsService.qmltypes
562
3
4
563
=== modified file 'tests/mocks/CMakeLists.txt'
564
--- tests/mocks/CMakeLists.txt	2013-11-14 11:48:33 +0000
565
+++ tests/mocks/CMakeLists.txt	2014-05-15 15:00:34 +0000
566
@@ -1,3 +1,33 @@
567
1
include(QmlPlugins)
568
2
569
3
# Set up and optionally install a mock plugin for unity8.
570
4
#
571
5
# add_unity8_mock(plugin version path
572
6
#     [PREFIX string]  # Install the plugin to the specified prefix under unity8 private plugin directory
573
7
#     [...]            # See export_qmlfiles and export_qmlplugin documentation for more options
574
8
# )
575
9
576
10
macro(add_unity8_mock PLUGIN VERSION PATH)
577
11
    set(single PREFIX)
578
12
    cmake_parse_arguments(MOCK "" "${single}" "" ${ARGN})
579
13
580
14
    if(MOCK_PREFIX)
581
15
        export_qmlfiles(${PLUGIN} ${PATH}
582
16
            DESTINATION ${SHELL_INSTALL_QML}/${MOCK_PREFIX}
583
17
            TARGET_PREFIX ${MOCK_PREFIX}-Mock
584
18
            ${MOCK_UNPARSED_ARGUMENTS}
585
19
        )
586
20
        export_qmlplugin(${PLUGIN} ${VERSION} ${PATH}
587
21
            DESTINATION ${SHELL_INSTALL_QML}/${MOCK_PREFIX}
588
22
            TARGET_PREFIX ${MOCK_PREFIX}-Mock
589
23
            ${MOCK_UNPARSED_ARGUMENTS}
590
24
        )
591
25
    else()
592
26
        export_qmlfiles(${PLUGIN} ${PATH} TARGET_PREFIX Mock ${MOCK_UNPARSED_ARGUMENTS})
593
27
        export_qmlplugin(${PLUGIN} ${VERSION} ${PATH} TARGET_PREFIX Mock ${MOCK_UNPARSED_ARGUMENTS})
594
28
    endif()
595
29
endmacro()
596
30
597
1
add_subdirectory(AccountsService)
31
add_subdirectory(AccountsService)
598
2
add_subdirectory(GSettings.1.0)
32
add_subdirectory(GSettings.1.0)
599
3
add_subdirectory(HudClient)
33
add_subdirectory(HudClient)
600
4
34
601
=== modified file 'tests/mocks/GSettings.1.0/CMakeLists.txt'
602
--- tests/mocks/GSettings.1.0/CMakeLists.txt	2013-08-14 11:18:24 +0000
603
+++ tests/mocks/GSettings.1.0/CMakeLists.txt	2014-05-15 15:00:34 +0000
604
@@ -17,7 +17,4 @@
605
17
17
606
18
qt5_use_modules(FakeGSettingsQml Qml)
18
qt5_use_modules(FakeGSettingsQml Qml)
607
19
19
612
20
# copy qmldir file into build directory for shadow builds
20
add_unity8_mock(GSettings 1.0 GSettings.1.0 TARGETS FakeGSettingsQml)
609
21
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
610
22
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
611
23
    )
613
24
21
614
=== modified file 'tests/mocks/GSettings.1.0/qmldir'
615
--- tests/mocks/GSettings.1.0/qmldir	2013-08-12 13:05:38 +0000
616
+++ tests/mocks/GSettings.1.0/qmldir	2014-05-15 15:00:34 +0000
617
@@ -1,2 +1,3 @@
618
1
module GSettings
1
module GSettings
619
2
plugin FakeGSettingsQml
2
plugin FakeGSettingsQml
620
3
typeinfo GSettings.qmltypes
621
3
4
622
=== modified file 'tests/mocks/HudClient/CMakeLists.txt'
623
--- tests/mocks/HudClient/CMakeLists.txt	2013-08-13 09:10:59 +0000
624
+++ tests/mocks/HudClient/CMakeLists.txt	2014-05-15 15:00:34 +0000
625
@@ -35,7 +35,4 @@
626
35
35
627
36
qt5_use_modules(FakeHudClientQml Qml)
36
qt5_use_modules(FakeHudClientQml Qml)
628
37
37
633
38
# copy qmldir file into build directory for shadow builds
38
add_unity8_mock(HudClient 0.1 HudClient TARGETS FakeHudClientQml)
630
39
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
631
40
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
632
41
    )
634
42
39
635
=== modified file 'tests/mocks/HudClient/qmldir'
636
--- tests/mocks/HudClient/qmldir	2013-06-05 22:03:08 +0000
637
+++ tests/mocks/HudClient/qmldir	2014-05-15 15:00:34 +0000
638
@@ -1,1 +1,3 @@
639
1
module HudClient
640
1
plugin FakeHudClientQml
2
plugin FakeHudClientQml
641
3
typeinfo HudClient.qmltypes
642
2
4
643
=== modified file 'tests/mocks/LightDM/CMakeLists.txt'
644
--- tests/mocks/LightDM/CMakeLists.txt	2014-01-14 21:01:28 +0000
645
+++ tests/mocks/LightDM/CMakeLists.txt	2014-05-15 15:00:34 +0000
646
@@ -43,15 +43,8 @@
647
43
43
648
44
qt5_use_modules(MockLightDM-qml DBus Gui Qml)
44
qt5_use_modules(MockLightDM-qml DBus Gui Qml)
649
45
45
662
46
# copy qmldir file into build directory for shadow builds
46
add_unity8_mock(LightDM 0.1 LightDM
663
47
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
47
    PREFIX mocks
664
48
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
48
    TARGETS MockLightDM-qml
665
49
    )
49
    ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/full"
666
50
50
)
655
51
install(TARGETS MockLightDM-qml
656
52
    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM
657
53
    )
658
54
659
55
install(FILES qmldir
660
56
    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM
661
57
    )
667
58
51
668
=== modified file 'tests/mocks/LightDM/qmldir'
669
--- tests/mocks/LightDM/qmldir	2013-06-05 22:03:08 +0000
670
+++ tests/mocks/LightDM/qmldir	2014-05-15 15:00:34 +0000
671
@@ -1,2 +1,3 @@
672
1
module LightDM
1
module LightDM
673
2
plugin MockLightDM-qml
2
plugin MockLightDM-qml
674
3
typeinfo LightDM.qmltypes
675
3
4
676
=== modified file 'tests/mocks/Powerd/CMakeLists.txt'
677
--- tests/mocks/Powerd/CMakeLists.txt	2013-11-25 17:26:15 +0000
678
+++ tests/mocks/Powerd/CMakeLists.txt	2014-05-15 15:00:34 +0000
679
@@ -7,15 +7,4 @@
680
7
7
681
8
qt5_use_modules(MockPowerd-qml Qml)
8
qt5_use_modules(MockPowerd-qml Qml)
682
9
9
695
10
# copy qmldir file into build directory for shadow builds
10
add_unity8_mock(Powerd 0.1 Powerd TARGETS MockPowerd-qml)
684
11
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
685
12
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
686
13
    )
687
14
688
15
install(TARGETS MockPowerd-qml
689
16
    DESTINATION ${SHELL_INSTALL_QML}/mocks/Powerd
690
17
    )
691
18
692
19
install(FILES qmldir
693
20
    DESTINATION ${SHELL_INSTALL_QML}/mocks/Powerd
694
21
    )
696
22
11
697
=== modified file 'tests/mocks/Powerd/qmldir'
698
--- tests/mocks/Powerd/qmldir	2013-08-09 14:35:36 +0000
699
+++ tests/mocks/Powerd/qmldir	2014-05-15 15:00:34 +0000
700
@@ -1,2 +1,3 @@
701
1
module Powerd
1
module Powerd
702
2
plugin MockPowerd-qml
2
plugin MockPowerd-qml
703
3
typeinfo Powerd.qmltypes
704
3
4
705
=== modified file 'tests/mocks/QMenuModel/CMakeLists.txt'
706
--- tests/mocks/QMenuModel/CMakeLists.txt	2013-10-11 17:16:52 +0000
707
+++ tests/mocks/QMenuModel/CMakeLists.txt	2014-05-15 15:00:34 +0000
708
@@ -1,15 +1,3 @@
709
1
file(GLOB QMLFILES
710
2
    *.qml
711
3
    *.js
712
4
    qmldir
713
5
)
714
6
715
7
# copy files into build directory for shadow builds
716
8
add_custom_target(QMenuModelQmlFiles ALL
717
9
    COMMAND cp ${QMLFILES} ${CMAKE_CURRENT_BINARY_DIR}
718
10
    DEPENDS ${QMLFILES}
719
11
)
720
12
721
13
include_directories(
1
include_directories(
722
14
  ${Qt5Core_INCLUDE_DIRS}
2
  ${Qt5Core_INCLUDE_DIRS}
723
15
  ${Qt5Quick_INCLUDE_DIRS}
3
  ${Qt5Quick_INCLUDE_DIRS}
724
@@ -32,3 +20,5 @@
725
32
set_target_properties(QMenuModelQml PROPERTIES
20
set_target_properties(QMenuModelQml PROPERTIES
726
33
                      OUTPUT_NAME qmenumodel
21
                      OUTPUT_NAME qmenumodel
727
34
                      VERSION 0)
22
                      VERSION 0)
728
23
729
24
add_unity8_mock(QMenuModel 0.1 QMenuModel TARGETS QMenuModelQml)
730
35
25
731
=== modified file 'tests/mocks/QMenuModel/qmldir'
732
--- tests/mocks/QMenuModel/qmldir	2013-10-14 09:39:13 +0000
733
+++ tests/mocks/QMenuModel/qmldir	2014-05-15 15:00:34 +0000
734
@@ -1,5 +1,6 @@
735
1
module QMenuModel
1
module QMenuModel
736
2
plugin qmenumodel
2
plugin qmenumodel
737
3
typeinfo QMenuModel.qmltypes
738
3
4
739
4
QDBusActionGroup 0.1 QDBusActionGroup.qml
5
QDBusActionGroup 0.1 QDBusActionGroup.qml
740
5
UnityMenuAction 0.1 UnityMenuAction.qml
6
UnityMenuAction 0.1 UnityMenuAction.qml
741
6
7
742
=== modified file 'tests/mocks/QtMultimedia/CMakeLists.txt'
743
--- tests/mocks/QtMultimedia/CMakeLists.txt	2013-11-27 11:27:19 +0000
744
+++ tests/mocks/QtMultimedia/CMakeLists.txt	2014-05-15 15:00:34 +0000
745
@@ -5,15 +5,4 @@
746
5
5
747
6
qt5_use_modules(QtMultimedia-qml Qml)
6
qt5_use_modules(QtMultimedia-qml Qml)
748
7
7
761
8
# copy qmldir file into build directory for shadow builds
8
add_unity8_mock(QtMultimedia 5.0 QtMultimedia TARGETS QtMultimedia-qml)
750
9
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
751
10
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
752
11
    )
753
12
754
13
install(TARGETS QtMultimedia-qml
755
14
    DESTINATION ${SHELL_INSTALL_QML}/mocks/QtMultimedia
756
15
    )
757
16
758
17
install(FILES qmldir
759
18
    DESTINATION ${SHELL_INSTALL_QML}/mocks/QtMultimedia
760
19
    )
762
20
9
763
=== modified file 'tests/mocks/QtMultimedia/qmldir'
764
--- tests/mocks/QtMultimedia/qmldir	2013-11-14 11:48:33 +0000
765
+++ tests/mocks/QtMultimedia/qmldir	2014-05-15 15:00:34 +0000
766
@@ -1,2 +1,3 @@
767
1
module QtMultimedia
1
module QtMultimedia
768
2
plugin QtMultimedia-qml
2
plugin QtMultimedia-qml
769
3
typeinfo QtMultimedia.qmltypes
770
3
4
771
=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt'
772
--- tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt	2013-11-25 17:26:15 +0000
773
+++ tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt	2014-05-15 15:00:34 +0000
774
@@ -7,12 +7,4 @@
775
7
7
776
8
qt5_use_modules(FakeUbuntuDownloadDaemonListenerQml Core Quick)
8
qt5_use_modules(FakeUbuntuDownloadDaemonListenerQml Core Quick)
777
9
9
787
10
# copy files into build directory for shadow builds
10
add_unity8_mock(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS FakeUbuntuDownloadDaemonListenerQml)
779
11
add_custom_target(UbuntuDownloadQmlDirFile ALL
780
12
    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
781
13
    DEPENDS qmldir
782
14
)
783
15
784
16
install(TARGETS FakeUbuntuDownloadDaemonListenerQml
785
17
    DESTINATION ${SHELL_INSTALL_QML}/mocks/Ubuntu/DownloadDaemonListener
786
18
    )
788
19
11
789
=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/qmldir'
790
--- tests/mocks/Ubuntu/DownloadDaemonListener/qmldir	2013-08-05 14:52:55 +0000
791
+++ tests/mocks/Ubuntu/DownloadDaemonListener/qmldir	2014-05-15 15:00:34 +0000
792
@@ -1,2 +1,3 @@
793
1
module Ubuntu.DownloadDaemonListener
1
module Ubuntu.DownloadDaemonListener
794
2
plugin FakeUbuntuDownloadDaemonListenerQml
2
plugin FakeUbuntuDownloadDaemonListenerQml
795
3
typeinfo DownloadDaemonListener.qmltypes
796
3
4
797
=== modified file 'tests/mocks/Ubuntu/Thumbnailer/CMakeLists.txt'
798
--- tests/mocks/Ubuntu/Thumbnailer/CMakeLists.txt	2014-04-01 15:18:40 +0000
799
+++ tests/mocks/Ubuntu/Thumbnailer/CMakeLists.txt	2014-05-15 15:00:34 +0000
800
@@ -1,7 +1,1 @@
808
1
# copy files into build directory for shadow builds
1
add_unity8_mock(Ubuntu.Thumbnailer 0.1 Ubuntu/Thumbnailer)
802
2
add_custom_target(UbuntuThumbnailerQmlDirFile ALL
803
3
    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
804
4
    DEPENDS qmldir
805
5
)
806
6
807
7
install(FILES qmldir DESTINATION ${SHELL_INSTALL_QML}/mocks/Ubuntu/Thumbnailer)
809
8
2
810
=== modified file 'tests/mocks/Ubuntu/Thumbnailer/qmldir'
811
--- tests/mocks/Ubuntu/Thumbnailer/qmldir	2014-04-01 15:25:26 +0000
812
+++ tests/mocks/Ubuntu/Thumbnailer/qmldir	2014-05-15 15:00:34 +0000
813
@@ -1,2 +1,4 @@
814
1
module Ubuntu.Thumbnailer
1
module Ubuntu.Thumbnailer
815
2
typeinfo Thumbnailer.qmltypes
816
3
817
2
Dummy 0.1 Dummy.qml
4
Dummy 0.1 Dummy.qml
818
3
5
819
=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
820
--- tests/mocks/Unity/Application/CMakeLists.txt	2014-04-02 11:19:54 +0000
821
+++ tests/mocks/Unity/Application/CMakeLists.txt	2014-05-15 15:00:34 +0000
822
@@ -12,40 +12,14 @@
823
12
12
824
13
add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
13
add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
825
14
14
826
15
add_library(NonMirUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
827
16
set_target_properties(NonMirUnityApplicationQml PROPERTIES OUTPUT_NAME FakeUnityApplicationQml)
828
17
829
15
qt5_use_modules(FakeUnityApplicationQml Core Quick)
18
qt5_use_modules(FakeUnityApplicationQml Core Quick)
866
16
19
qt5_use_modules(NonMirUnityApplicationQml Core Quick)
867
17
# copy files into build directory for shadow builds
20
868
18
add_custom_target(UnityAppQmlDirFile ALL
21
add_unity8_mock(Unity.Application 0.1 Unity/Application PREFIX mocks TARGETS FakeUnityApplicationQml)
869
19
    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
22
add_unity8_mock(Unity.Application 0.1 Unity/Application
870
20
    DEPENDS qmldir
23
                PREFIX nonmirplugins
871
21
)
24
                TARGETS NonMirUnityApplicationQml
872
22
add_custom_target(InputFilterAreaQmlFile ALL
25
                BINARY_DIR ${CMAKE_BINARY_DIR}/nonmirplugins)
837
23
    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/InputFilterArea.qml" ${CMAKE_CURRENT_BINARY_DIR}
838
24
    DEPENDS InputFilterArea.qml
839
25
)
840
26
add_custom_target(OSKControllerQmlFile ALL
841
27
    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/OSKController.qml" ${CMAKE_CURRENT_BINARY_DIR}
842
28
    DEPENDS OSKController.qml
843
29
)
844
30
845
31
install(TARGETS FakeUnityApplicationQml
846
32
    DESTINATION ${SHELL_INSTALL_QML}/mocks/Unity/Application
847
33
    )
848
34
849
35
install(FILES qmldir InputFilterArea.qml OSKController.qml
850
36
    DESTINATION ${SHELL_INSTALL_QML}/mocks/Unity/Application
851
37
    )
852
38
853
39
# Duplicate the mock to nonmirplugins
854
40
# In shadow builds we just link it, in real installs we also install it to the other path
855
41
add_custom_target(OSKControllerQmlFile2 ALL
856
42
    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/nonmirplugins/Unity && rm -f ${CMAKE_BINARY_DIR}/nonmirplugins/Unity/Application && ln -s ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}/nonmirplugins/Unity
857
43
    DEPENDS qmldir
858
44
)
859
45
install(TARGETS FakeUnityApplicationQml
860
46
    DESTINATION ${SHELL_INSTALL_QML}/nonmirplugins/Unity/Application
861
47
    )
862
48
863
49
install(FILES qmldir InputFilterArea.qml OSKController.qml
864
50
    DESTINATION ${SHELL_INSTALL_QML}/nonmirplugins/Unity/Application
865
51
    )
873
52
26
874
=== modified file 'tests/mocks/Unity/Application/qmldir'
875
--- tests/mocks/Unity/Application/qmldir	2013-09-10 15:03:47 +0000
876
+++ tests/mocks/Unity/Application/qmldir	2014-05-15 15:00:34 +0000
877
@@ -1,4 +1,6 @@
878
1
module Unity.Application
1
module Unity.Application
879
2
plugin FakeUnityApplicationQml
2
plugin FakeUnityApplicationQml
880
3
typeinfo Application.qmltypes
881
4
882
3
InputFilterArea 0.1 InputFilterArea.qml
5
InputFilterArea 0.1 InputFilterArea.qml
883
4
OSKController 0.1 OSKController.qml
6
OSKController 0.1 OSKController.qml
884
5
7
885
=== modified file 'tests/mocks/Unity/CMakeLists.txt'
886
--- tests/mocks/Unity/CMakeLists.txt	2014-02-25 15:43:42 +0000
887
+++ tests/mocks/Unity/CMakeLists.txt	2014-05-15 15:00:34 +0000
888
@@ -39,15 +39,4 @@
889
39
39
890
40
qt5_use_modules(FakeUnityQml Qml)
40
qt5_use_modules(FakeUnityQml Qml)
891
41
41
904
42
# copy qmldir file into build directory for shadow builds
42
add_unity8_mock(Unity 0.2 Unity PREFIX scopefakes TARGETS FakeUnityQml)
893
43
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
894
44
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
895
45
    )
896
46
897
47
install(TARGETS FakeUnityQml
898
48
    DESTINATION ${SHELL_INSTALL_QML}/scopefakes/Unity
899
49
    )
900
50
901
51
install(FILES qmldir
902
52
    DESTINATION ${SHELL_INSTALL_QML}/scopefakes/Unity
903
53
    )
905
54
43
906
=== modified file 'tests/mocks/Unity/Indicators/CMakeLists.txt'
907
--- tests/mocks/Unity/Indicators/CMakeLists.txt	2014-03-03 11:55:00 +0000
908
+++ tests/mocks/Unity/Indicators/CMakeLists.txt	2014-05-15 15:00:34 +0000
909
@@ -37,17 +37,4 @@
910
37
37
911
38
qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
38
qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
912
39
39
927
40
file(GLOB IndicatorsFake_QMLFILES
40
add_unity8_mock(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsFakeQml)
914
41
    *.qml
915
42
    qml/FakeMenuPage.qml
916
43
)
917
44
918
45
# copy qmldir file into build directory for shadow builds
919
46
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
920
47
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
921
48
)
922
49
923
50
# copy qmldir file into build directory for shadow builds
924
51
file(COPY ${IndicatorsFake_QMLFILES}
925
52
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
926
53
)
928
54
41
929
=== renamed file 'tests/mocks/Unity/Indicators/qml/FakeMenuPage.qml' => 'tests/mocks/Unity/Indicators/FakeMenuPage.qml'
930
=== modified file 'tests/mocks/Unity/Indicators/qmldir'
931
--- tests/mocks/Unity/Indicators/qmldir	2013-12-13 11:18:03 +0000
932
+++ tests/mocks/Unity/Indicators/qmldir	2014-05-15 15:00:34 +0000
933
@@ -1,5 +1,6 @@
934
1
module Unity.Indicators
1
module Unity.Indicators
935
2
plugin IndicatorsFakeQml
2
plugin IndicatorsFakeQml
936
3
typeinfo Indicators.qmltypes
937
3
4
938
4
CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
5
CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
939
5
IndicatorBase 0.1 IndicatorBase.qml
6
IndicatorBase 0.1 IndicatorBase.qml
940
6
7
941
=== modified file 'tests/mocks/Unity/Launcher/CMakeLists.txt'
942
--- tests/mocks/Unity/Launcher/CMakeLists.txt	2013-12-13 01:02:53 +0000
943
+++ tests/mocks/Unity/Launcher/CMakeLists.txt	2014-05-15 15:00:34 +0000
944
@@ -20,8 +20,4 @@
945
20
20
946
21
qt5_use_modules(MockLauncherPlugin Core Quick)
21
qt5_use_modules(MockLauncherPlugin Core Quick)
947
22
22
953
23
# copy files into build directory for shadow builds
23
add_unity8_mock(Unity.Launcher 0.1 Unity/Launcher TARGETS MockLauncherPlugin)
949
24
add_custom_target(LauncherPluginQmlDirFile ALL
950
25
    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
951
26
    DEPENDS qmldir
952
27
)
954
28
24
955
=== modified file 'tests/mocks/Unity/Launcher/qmldir'
956
--- tests/mocks/Unity/Launcher/qmldir	2013-07-05 11:25:54 +0000
957
+++ tests/mocks/Unity/Launcher/qmldir	2014-05-15 15:00:34 +0000
958
@@ -1,2 +1,3 @@
959
1
module Unity.Launcher
1
module Unity.Launcher
960
2
plugin MockLauncherPlugin
2
plugin MockLauncherPlugin
961
3
typeinfo Launcher.qmltypes
962
3
4
963
=== modified file 'tests/mocks/Unity/Notifications/CMakeLists.txt'
964
--- tests/mocks/Unity/Notifications/CMakeLists.txt	2013-07-26 11:10:55 +0000
965
+++ tests/mocks/Unity/Notifications/CMakeLists.txt	2014-05-15 15:00:34 +0000
966
@@ -1,11 +1,1 @@
978
1
file(GLOB QMLFILES
1
add_unity8_mock(Unity.Notifications 1.0 Unity/Notifications)
968
2
    *.qml
969
3
    *.js
970
4
    qmldir
971
5
)
972
6
973
7
# copy files into build directory for shadow builds
974
8
add_custom_target(NotificationsQmlFiles ALL
975
9
    COMMAND cp ${QMLFILES} ${CMAKE_CURRENT_BINARY_DIR}
976
10
    DEPENDS ${QMLFILES}
977
11
)
979
12
2
980
=== modified file 'tests/mocks/Unity/Notifications/qmldir'
981
--- tests/mocks/Unity/Notifications/qmldir	2013-06-19 08:12:15 +0000
982
+++ tests/mocks/Unity/Notifications/qmldir	2014-05-15 15:00:34 +0000
983
@@ -1,2 +1,3 @@
984
1
module Unity.Notifications
1
module Unity.Notifications
985
2
Notification 1.0 notification.js
2
Notification 1.0 notification.js
986
3
typeinfo Notifications.qmltypes
987
3
4
988
=== modified file 'tests/mocks/Unity/qmldir'
989
--- tests/mocks/Unity/qmldir	2013-06-05 22:03:08 +0000
990
+++ tests/mocks/Unity/qmldir	2014-05-15 15:00:34 +0000
991
@@ -1,2 +1,3 @@
992
1
module Unity
1
module Unity
993
2
plugin FakeUnityQml
2
plugin FakeUnityQml
994
3
typeinfo Unity.qmltypes
995
3
4
996
=== modified file 'tests/utils/modules/Unity/Test/CMakeLists.txt'
997
--- tests/utils/modules/Unity/Test/CMakeLists.txt	2013-12-17 14:56:25 +0000
998
+++ tests/utils/modules/Unity/Test/CMakeLists.txt	2014-05-15 15:00:34 +0000
999
@@ -1,3 +1,5 @@
1000
1
include(QmlPlugins)
1001
2
1002
1
add_definitions(-DQT_NO_KEYWORDS)
3
add_definitions(-DQT_NO_KEYWORDS)
1003
2
4
1004
3
include_directories(
5
include_directories(
1005
@@ -14,10 +16,5 @@
1006
14
16
1007
15
qt5_use_modules(UnityTestQml Core Quick Test)
17
qt5_use_modules(UnityTestQml Core Quick Test)
1008
16
18
1016
17
# copy qml files into build directory for shadow builds
19
export_qmlfiles(Unity.Test Unity/Test)
1017
18
file(GLOB QML_JS_FILES *.js *.qml qmldir)
20
export_qmlplugin(Unity.Test 0.1 Unity/Test TARGETS UnityTestQml)
1011
19
1012
20
add_custom_target(UnityTestQmlJsFiles ALL
1013
21
    COMMAND cp ${QML_JS_FILES} ${CMAKE_CURRENT_BINARY_DIR}
1014
22
    DEPENDS ${QML_JS_FILES}
1015
23
)
1018
24
21
1019
=== modified file 'tests/utils/modules/Unity/Test/qmldir'
1020
--- tests/utils/modules/Unity/Test/qmldir	2013-06-05 22:03:08 +0000
1021
+++ tests/utils/modules/Unity/Test/qmldir	2014-05-15 15:00:34 +0000
1022
@@ -1,3 +1,5 @@
1023
1
module Unity.Test
1
module Unity.Test
1024
2
plugin UnityTestQml
2
plugin UnityTestQml
1025
3
typeinfo Test.qmltypes
1026
4
1027
3
UnityTestCase 0.1 UnityTestCase.qml
5
UnityTestCase 0.1 UnityTestCase.qml
Status:	Merged
Approved by:	Nick Dedekind on 2014-05-16
Approved revision:	877
Merged at revision:	906
Proposed branch:	lp:~saviq/unity8/cmake-plugin-cleanup
Merge into:	lp:unity8
Diff against target:	1027 lines (+243/-288) 56 files modified cmake/modules/QmlPlugins.cmake (+124/-49) plugins/AccountsService/CMakeLists.txt (+1/-4) plugins/AccountsService/qmldir (+1/-1) plugins/CMakeLists.txt (+13/-0) plugins/Dash/CMakeLists.txt (+1/-6) plugins/Dash/qmldir (+1/-1) plugins/HudClient/CMakeLists.txt (+1/-6) plugins/HudClient/qmldir (+1/-1) plugins/LightDM/CMakeLists.txt (+1/-6) plugins/LightDM/qmldir (+1/-1) plugins/Powerd/CMakeLists.txt (+1/-3) plugins/Powerd/qmldir (+1/-1) plugins/SessionBroadcast/CMakeLists.txt (+1/-4) plugins/SessionBroadcast/qmldir (+1/-1) plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt (+1/-6) plugins/Ubuntu/DownloadDaemonListener/qmldir (+1/-1) plugins/Ubuntu/Gestures/CMakeLists.txt (+1/-6) plugins/Ubuntu/Gestures/qmldir (+1/-1) plugins/Unity/Indicators/CMakeLists.txt (+4/-7) plugins/Unity/Indicators/qml/CMakeLists.txt (+0/-5) plugins/Unity/Indicators/qml/qmldir (+1/-1) plugins/Unity/Launcher/CMakeLists.txt (+1/-3) plugins/Unity/Launcher/qmldir (+1/-1) plugins/Utils/CMakeLists.txt (+1/-3) plugins/Utils/qmldir (+1/-1) tests/mocks/AccountsService/CMakeLists.txt (+1/-12) tests/mocks/AccountsService/qmldir (+1/-0) tests/mocks/CMakeLists.txt (+30/-0) tests/mocks/GSettings.1.0/CMakeLists.txt (+1/-4) tests/mocks/GSettings.1.0/qmldir (+1/-0) tests/mocks/HudClient/CMakeLists.txt (+1/-4) tests/mocks/HudClient/qmldir (+2/-0) tests/mocks/LightDM/CMakeLists.txt (+5/-12) tests/mocks/LightDM/qmldir (+1/-0) tests/mocks/Powerd/CMakeLists.txt (+1/-12) tests/mocks/Powerd/qmldir (+1/-0) tests/mocks/QMenuModel/CMakeLists.txt (+2/-12) tests/mocks/QMenuModel/qmldir (+1/-0) tests/mocks/QtMultimedia/CMakeLists.txt (+1/-12) tests/mocks/QtMultimedia/qmldir (+1/-0) tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt (+1/-9) tests/mocks/Ubuntu/DownloadDaemonListener/qmldir (+1/-0) tests/mocks/Ubuntu/Thumbnailer/CMakeLists.txt (+1/-7) tests/mocks/Ubuntu/Thumbnailer/qmldir (+2/-0) tests/mocks/Unity/Application/CMakeLists.txt (+10/-36) tests/mocks/Unity/Application/qmldir (+2/-0) tests/mocks/Unity/CMakeLists.txt (+1/-12) tests/mocks/Unity/Indicators/CMakeLists.txt (+1/-14) tests/mocks/Unity/Indicators/qmldir (+1/-0) tests/mocks/Unity/Launcher/CMakeLists.txt (+1/-5) tests/mocks/Unity/Launcher/qmldir (+1/-0) tests/mocks/Unity/Notifications/CMakeLists.txt (+1/-11) tests/mocks/Unity/Notifications/qmldir (+1/-0) tests/mocks/Unity/qmldir (+1/-0) tests/utils/modules/Unity/Test/CMakeLists.txt (+4/-7) tests/utils/modules/Unity/Test/qmldir (+2/-0)
To merge this branch:	bzr merge lp:~saviq/unity8/cmake-plugin-cleanup
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-05-16
Nick Dedekind (community)		2014-05-02	Approve on 2014-05-16
Albert Astals Cid (community)			Needs Fixing on 2014-05-14
Review via email: mp+218171@code.launchpad.net