1
=== modified file 'plugins/CMakeLists.txt'
2
--- plugins/CMakeLists.txt	2015-04-09 12:58:23 +0000
3
+++ plugins/CMakeLists.txt	2016-12-22 14:37:25 +0000
4
@@ -1,4 +1,4 @@
6
1
include(QmlPlugins)
1
find_package(QmlPlugins)
7
2
2
8
3
macro(add_usc_plugin PLUGIN VERSION PATH)
3
macro(add_usc_plugin PLUGIN VERSION PATH)
9
4
    export_qmlfiles(${PLUGIN} ${PATH} DESTINATION ${QT_IMPORTS_DIR} ${ARGN})
4
    export_qmlfiles(${PLUGIN} ${PATH} DESTINATION ${QT_IMPORTS_DIR} ${ARGN})
10
5
5
11
=== modified file 'tests/qmltests/mocks/CMakeLists.txt'
12
--- tests/qmltests/mocks/CMakeLists.txt	2016-08-17 10:19:32 +0000
13
+++ tests/qmltests/mocks/CMakeLists.txt	2016-12-22 14:37:25 +0000
14
@@ -1,4 +1,4 @@
16
1
include(QmlPlugins)
1
find_package(QmlPlugins)
17
2
2
18
3
# Set up and optionally install a mock plugin for ubuntu-settings-components.
3
# Set up and optionally install a mock plugin for ubuntu-settings-components.
19
4
#
4
#
20
5
5
21
=== modified file 'tests/utils/modules/CMakeLists.txt'
22
--- tests/utils/modules/CMakeLists.txt	2016-01-29 00:46:56 +0000
23
+++ tests/utils/modules/CMakeLists.txt	2016-12-22 14:37:25 +0000
24
@@ -1,3 +1,3 @@
26
1
include(QmlPlugins)
1
find_package(QmlPlugins)
27
2
2
28
3
add_subdirectory(Ubuntu)
3
add_subdirectory(Ubuntu)
Status:	Merged
Approved by:	Zoltan Balogh on 2017-01-03
Approved revision:	177
Merged at revision:	177
Proposed branch:	lp:~3v1n0/ubuntu-settings-components/cmake-find-pkg
Merge into:	lp:ubuntu-settings-components
Diff against target:	28 lines (+3/-3) 3 files modified plugins/CMakeLists.txt (+1/-1) tests/qmltests/mocks/CMakeLists.txt (+1/-1) tests/utils/modules/CMakeLists.txt (+1/-1)
To merge this branch:	bzr merge lp:~3v1n0/ubuntu-settings-components/cmake-find-pkg
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-12-22
Unity Team		2016-12-22	Pending
Review via email: mp+313768@code.launchpad.net
1	=== modified file 'plugins/CMakeLists.txt'
2	--- plugins/CMakeLists.txt 2015-04-09 12:58:23 +0000
3	+++ plugins/CMakeLists.txt 2016-12-22 14:37:25 +0000
4	@@ -1,4 +1,4 @@
6	1	include(QmlPlugins)	1	find_package(QmlPlugins)
7	2		2
8	3	macro(add_usc_plugin PLUGIN VERSION PATH)	3	macro(add_usc_plugin PLUGIN VERSION PATH)
9	4	export_qmlfiles(${PLUGIN} ${PATH} DESTINATION ${QT_IMPORTS_DIR} ${ARGN})	4	export_qmlfiles(${PLUGIN} ${PATH} DESTINATION ${QT_IMPORTS_DIR} ${ARGN})
10	5		5
11	=== modified file 'tests/qmltests/mocks/CMakeLists.txt'
12	--- tests/qmltests/mocks/CMakeLists.txt 2016-08-17 10:19:32 +0000
13	+++ tests/qmltests/mocks/CMakeLists.txt 2016-12-22 14:37:25 +0000
14	@@ -1,4 +1,4 @@
16	1	include(QmlPlugins)	1	find_package(QmlPlugins)
17	2		2
18	3	# Set up and optionally install a mock plugin for ubuntu-settings-components.	3	# Set up and optionally install a mock plugin for ubuntu-settings-components.
19	4	#	4	#
20	5		5
21	=== modified file 'tests/utils/modules/CMakeLists.txt'
22	--- tests/utils/modules/CMakeLists.txt 2016-01-29 00:46:56 +0000
23	+++ tests/utils/modules/CMakeLists.txt 2016-12-22 14:37:25 +0000
24	@@ -1,3 +1,3 @@
26	1	include(QmlPlugins)	1	find_package(QmlPlugins)
27	2		2
28	3	add_subdirectory(Ubuntu)	3	add_subdirectory(Ubuntu)