Merge lp:~marcustomlinson/unity-scopes-shell/redundant_pkg_checks into lp:unity-scopes-shell

Proposed by Marcus Tomlinson on 2015-06-17
Status: Merged
Approved by: Paweł Stołowski on 2015-07-06
Approved revision: 243
Merged at revision: 228
Proposed branch: lp:~marcustomlinson/unity-scopes-shell/redundant_pkg_checks
Merge into: lp:unity-scopes-shell
Prerequisite: lp:~stolowski/unity-scopes-shell/settings-harness-fixes
Diff against target: 149 lines (+6/-31)
12 files modified
CMakeLists.txt (+4/-0)
src/CMakeLists.txt (+0/-6)
src/Unity/CMakeLists.txt (+0/-4)
tests/CMakeLists.txt (+0/-3)
tests/data/mock-scope-departments-flipflop/CMakeLists.txt (+0/-2)
tests/data/mock-scope-departments/CMakeLists.txt (+0/-2)
tests/data/mock-scope-double-nav/CMakeLists.txt (+0/-2)
tests/data/mock-scope-info/CMakeLists.txt (+0/-2)
tests/data/mock-scope-ttl/CMakeLists.txt (+0/-2)
tests/data/mock-scope/CMakeLists.txt (+1/-3)
tests/data/scopes/CMakeLists.txt (+0/-2)
tools/location/CMakeLists.txt (+1/-3)
To merge this branch: bzr merge lp:~marcustomlinson/unity-scopes-shell/redundant_pkg_checks
Reviewer Review Type Date Requested Status
Paweł Stołowski 2015-06-17 Approve on 2015-07-06
PS Jenkins bot (community) continuous-integration Needs Fixing on 2015-06-17
Review via email: mp+262180@code.launchpad.net

Commit message

Clean out redundant pkg_check_modules calls in multiple CMakeLists.txt files

To post a comment you must log in.
242. By Marcus Tomlinson on 2015-06-17

Consolidate pkg_check_modules calls to top level CMakeLists.txt

Marcus Tomlinson (marcustomlinson) wrote :

@Pawel, could you have a look at this? Would probably be worth pooling this one in with the pre-req MP (settings-harness-fixes) for landing. Thanks!

243. By Marcus Tomlinson on 2015-07-06

Merged trunk

Paweł Stołowski (stolowski) wrote :

Thanks for spotting, looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-06-17 16:30:48 +0000
3+++ CMakeLists.txt 2015-07-06 14:10:39 +0000
4@@ -53,6 +53,10 @@
5 pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.19)
6 pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=6)
7
8+pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
9+pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
10+pkg_check_modules(ONLINE_ACCOUNTS_CLIENT REQUIRED OnlineAccountsClient)
11+
12 # Standard install paths
13 include(GNUInstallDirs)
14
15
16=== modified file 'src/CMakeLists.txt'
17--- src/CMakeLists.txt 2015-03-04 09:20:43 +0000
18+++ src/CMakeLists.txt 2015-07-06 14:10:39 +0000
19@@ -1,10 +1,4 @@
20
21-# Dependencies
22-pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
23-pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
24-pkg_check_modules(ONLINE_ACCOUNTS_CLIENT REQUIRED OnlineAccountsClient)
25-pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
26-
27 include_directories(
28 ${UBUNTU_LOCATION_SERVICE_INCLUDE_DIRS}
29 )
30
31=== modified file 'src/Unity/CMakeLists.txt'
32--- src/Unity/CMakeLists.txt 2015-03-20 14:44:32 +0000
33+++ src/Unity/CMakeLists.txt 2015-07-06 14:10:39 +0000
34@@ -3,10 +3,6 @@
35
36 include(QtWithObjectTarget)
37
38-# Dependencies
39-pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
40-pkg_check_modules(ONLINE_ACCOUNTS_CLIENT REQUIRED OnlineAccountsClient)
41-
42 include_directories(
43 ${CMAKE_CURRENT_SOURCE_DIR}
44 ${CMAKE_CURRENT_BINARY_DIR}
45
46=== modified file 'tests/CMakeLists.txt'
47--- tests/CMakeLists.txt 2015-05-18 14:55:46 +0000
48+++ tests/CMakeLists.txt 2015-07-06 14:10:39 +0000
49@@ -1,6 +1,3 @@
50-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=6)
51-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.2)
52-pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
53 pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1>=0.2 REQUIRED)
54 pkg_check_modules(QTDBUSMOCK REQUIRED libqtdbusmock-1>=0.2 REQUIRED)
55
56
57=== modified file 'tests/data/mock-scope-departments-flipflop/CMakeLists.txt'
58--- tests/data/mock-scope-departments-flipflop/CMakeLists.txt 2014-11-19 14:04:32 +0000
59+++ tests/data/mock-scope-departments-flipflop/CMakeLists.txt 2015-07-06 14:10:39 +0000
60@@ -1,5 +1,3 @@
61-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.0)
62-
63 set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
64
65 include_directories(${SCOPESLIB_INCLUDE_DIRS})
66
67=== modified file 'tests/data/mock-scope-departments/CMakeLists.txt'
68--- tests/data/mock-scope-departments/CMakeLists.txt 2015-02-02 09:45:49 +0000
69+++ tests/data/mock-scope-departments/CMakeLists.txt 2015-07-06 14:10:39 +0000
70@@ -1,5 +1,3 @@
71-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.0)
72-
73 set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
74
75 include_directories(${SCOPESLIB_INCLUDE_DIRS})
76
77=== modified file 'tests/data/mock-scope-double-nav/CMakeLists.txt'
78--- tests/data/mock-scope-double-nav/CMakeLists.txt 2014-11-19 14:04:32 +0000
79+++ tests/data/mock-scope-double-nav/CMakeLists.txt 2015-07-06 14:10:39 +0000
80@@ -1,5 +1,3 @@
81-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.0)
82-
83 set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
84
85 include_directories(${SCOPESLIB_INCLUDE_DIRS})
86
87=== modified file 'tests/data/mock-scope-info/CMakeLists.txt'
88--- tests/data/mock-scope-info/CMakeLists.txt 2014-08-14 10:14:39 +0000
89+++ tests/data/mock-scope-info/CMakeLists.txt 2015-07-06 14:10:39 +0000
90@@ -1,5 +1,3 @@
91-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.0)
92-
93 set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
94
95 include_directories(${SCOPESLIB_INCLUDE_DIRS})
96
97=== modified file 'tests/data/mock-scope-ttl/CMakeLists.txt'
98--- tests/data/mock-scope-ttl/CMakeLists.txt 2014-06-03 13:35:17 +0000
99+++ tests/data/mock-scope-ttl/CMakeLists.txt 2015-07-06 14:10:39 +0000
100@@ -1,5 +1,3 @@
101-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.0)
102-
103 set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
104
105 include_directories(${SCOPESLIB_INCLUDE_DIRS})
106
107=== modified file 'tests/data/mock-scope/CMakeLists.txt'
108--- tests/data/mock-scope/CMakeLists.txt 2014-08-05 16:24:32 +0000
109+++ tests/data/mock-scope/CMakeLists.txt 2015-07-06 14:10:39 +0000
110@@ -1,9 +1,7 @@
111-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.5.0)
112-
113 include_directories(${SCOPESLIB_INCLUDE_DIRS})
114
115 add_library(mock-scope MODULE mock-scope.cpp)
116 target_link_libraries(mock-scope ${SCOPESLIB_LDFLAGS})
117
118 configure_file(mock-scope.ini.in mock-scope.ini)
119-configure_file(mock-scope-settings.ini mock-scope-settings.ini)
120\ No newline at end of file
121+configure_file(mock-scope-settings.ini mock-scope-settings.ini)
122
123=== modified file 'tests/data/scopes/CMakeLists.txt'
124--- tests/data/scopes/CMakeLists.txt 2014-07-22 13:49:50 +0000
125+++ tests/data/scopes/CMakeLists.txt 2015-07-06 14:10:39 +0000
126@@ -1,5 +1,3 @@
127-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.5.0)
128-
129 include_directories(${SCOPESLIB_INCLUDE_DIRS})
130
131 add_library(scopes MODULE scopes.cpp)
132
133=== modified file 'tools/location/CMakeLists.txt'
134--- tools/location/CMakeLists.txt 2014-07-15 08:37:40 +0000
135+++ tools/location/CMakeLists.txt 2015-07-06 14:10:39 +0000
136@@ -1,6 +1,4 @@
137
138-pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
139-
140 include_directories(
141 ${Unity-qml_SOURCE_DIR}
142 ${CMAKE_SOURCE_DIR}/src/Unity
143@@ -18,4 +16,4 @@
144 Unity-qml
145 ${SCOPESLIB_LDFLAGS}
146 ${GSETTINGSQT_LDFLAGS}
147- )
148\ No newline at end of file
149+ )

Subscribers

People subscribed via source and target branches

to all changes: