unity-scopes-shell

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

  1. redundant_pkg_checks
  2. Merge into trunk
Proposed by Marcus Tomlinson
Status: Merged
Approved by: Paweł Stołowski
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 (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/352/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/352/rebuild

review: Needs Fixing (continuous-integration)
lp:~marcustomlinson/unity-scopes-shell/redundant_pkg_checks updated
242. By Marcus Tomlinson

Consolidate pkg_check_modules calls to top level CMakeLists.txt

Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Build is failing due to same reason as prerequisite branch: https://code.launchpad.net/~stolowski/unity-scopes-shell/settings-harness-fixes/+merge/261750/comments/655332

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:242
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/353/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/353/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
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!

lp:~marcustomlinson/unity-scopes-shell/redundant_pkg_checks updated
243. By Marcus Tomlinson

Merged trunk

Revision history for this message
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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-06-17 16:30:48 +0000
+++ CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -53,6 +53,10 @@
53pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.19)53pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.19)
54pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=6)54pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=6)
5555
56pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
57pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
58pkg_check_modules(ONLINE_ACCOUNTS_CLIENT REQUIRED OnlineAccountsClient)
59
56# Standard install paths60# Standard install paths
57include(GNUInstallDirs)61include(GNUInstallDirs)
5862
5963
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2015-03-04 09:20:43 +0000
+++ src/CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -1,10 +1,4 @@
11
2# Dependencies
3pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
4pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
5pkg_check_modules(ONLINE_ACCOUNTS_CLIENT REQUIRED OnlineAccountsClient)
6pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
7
8include_directories(2include_directories(
9 ${UBUNTU_LOCATION_SERVICE_INCLUDE_DIRS}3 ${UBUNTU_LOCATION_SERVICE_INCLUDE_DIRS}
10)4)
115
=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt 2015-03-20 14:44:32 +0000
+++ src/Unity/CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -3,10 +3,6 @@
33
4include(QtWithObjectTarget)4include(QtWithObjectTarget)
55
6# Dependencies
7pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
8pkg_check_modules(ONLINE_ACCOUNTS_CLIENT REQUIRED OnlineAccountsClient)
9
10include_directories(6include_directories(
11 ${CMAKE_CURRENT_SOURCE_DIR}7 ${CMAKE_CURRENT_SOURCE_DIR}
12 ${CMAKE_CURRENT_BINARY_DIR}8 ${CMAKE_CURRENT_BINARY_DIR}
139
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt 2015-05-18 14:55:46 +0000
+++ tests/CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -1,6 +1,3 @@
1pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=6)
2pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.2)
3pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
4pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1>=0.2 REQUIRED)1pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1>=0.2 REQUIRED)
5pkg_check_modules(QTDBUSMOCK REQUIRED libqtdbusmock-1>=0.2 REQUIRED)2pkg_check_modules(QTDBUSMOCK REQUIRED libqtdbusmock-1>=0.2 REQUIRED)
63
74
=== modified file 'tests/data/mock-scope-departments-flipflop/CMakeLists.txt'
--- tests/data/mock-scope-departments-flipflop/CMakeLists.txt 2014-11-19 14:04:32 +0000
+++ tests/data/mock-scope-departments-flipflop/CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -1,5 +1,3 @@
1pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.0)
2
3set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})1set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
42
5include_directories(${SCOPESLIB_INCLUDE_DIRS})3include_directories(${SCOPESLIB_INCLUDE_DIRS})
64
=== modified file 'tests/data/mock-scope-departments/CMakeLists.txt'
--- tests/data/mock-scope-departments/CMakeLists.txt 2015-02-02 09:45:49 +0000
+++ tests/data/mock-scope-departments/CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -1,5 +1,3 @@
1pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.0)
2
3set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})1set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
42
5include_directories(${SCOPESLIB_INCLUDE_DIRS})3include_directories(${SCOPESLIB_INCLUDE_DIRS})
64
=== modified file 'tests/data/mock-scope-double-nav/CMakeLists.txt'
--- tests/data/mock-scope-double-nav/CMakeLists.txt 2014-11-19 14:04:32 +0000
+++ tests/data/mock-scope-double-nav/CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -1,5 +1,3 @@
1pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.0)
2
3set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})1set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
42
5include_directories(${SCOPESLIB_INCLUDE_DIRS})3include_directories(${SCOPESLIB_INCLUDE_DIRS})
64
=== modified file 'tests/data/mock-scope-info/CMakeLists.txt'
--- tests/data/mock-scope-info/CMakeLists.txt 2014-08-14 10:14:39 +0000
+++ tests/data/mock-scope-info/CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -1,5 +1,3 @@
1pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.0)
2
3set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})1set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
42
5include_directories(${SCOPESLIB_INCLUDE_DIRS})3include_directories(${SCOPESLIB_INCLUDE_DIRS})
64
=== modified file 'tests/data/mock-scope-ttl/CMakeLists.txt'
--- tests/data/mock-scope-ttl/CMakeLists.txt 2014-06-03 13:35:17 +0000
+++ tests/data/mock-scope-ttl/CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -1,5 +1,3 @@
1pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.0)
2
3set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})1set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
42
5include_directories(${SCOPESLIB_INCLUDE_DIRS})3include_directories(${SCOPESLIB_INCLUDE_DIRS})
64
=== modified file 'tests/data/mock-scope/CMakeLists.txt'
--- tests/data/mock-scope/CMakeLists.txt 2014-08-05 16:24:32 +0000
+++ tests/data/mock-scope/CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -1,9 +1,7 @@
1pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.5.0)
2
3include_directories(${SCOPESLIB_INCLUDE_DIRS})1include_directories(${SCOPESLIB_INCLUDE_DIRS})
42
5add_library(mock-scope MODULE mock-scope.cpp)3add_library(mock-scope MODULE mock-scope.cpp)
6target_link_libraries(mock-scope ${SCOPESLIB_LDFLAGS})4target_link_libraries(mock-scope ${SCOPESLIB_LDFLAGS})
75
8configure_file(mock-scope.ini.in mock-scope.ini)6configure_file(mock-scope.ini.in mock-scope.ini)
9configure_file(mock-scope-settings.ini mock-scope-settings.ini)
10\ No newline at end of file7\ No newline at end of file
8configure_file(mock-scope-settings.ini mock-scope-settings.ini)
119
=== modified file 'tests/data/scopes/CMakeLists.txt'
--- tests/data/scopes/CMakeLists.txt 2014-07-22 13:49:50 +0000
+++ tests/data/scopes/CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -1,5 +1,3 @@
1pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.5.0)
2
3include_directories(${SCOPESLIB_INCLUDE_DIRS})1include_directories(${SCOPESLIB_INCLUDE_DIRS})
42
5add_library(scopes MODULE scopes.cpp)3add_library(scopes MODULE scopes.cpp)
64
=== modified file 'tools/location/CMakeLists.txt'
--- tools/location/CMakeLists.txt 2014-07-15 08:37:40 +0000
+++ tools/location/CMakeLists.txt 2015-07-06 14:10:39 +0000
@@ -1,6 +1,4 @@
11
2pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
3
4include_directories(2include_directories(
5 ${Unity-qml_SOURCE_DIR}3 ${Unity-qml_SOURCE_DIR}
6 ${CMAKE_SOURCE_DIR}/src/Unity4 ${CMAKE_SOURCE_DIR}/src/Unity
@@ -18,4 +16,4 @@
18 Unity-qml16 Unity-qml
19 ${SCOPESLIB_LDFLAGS}17 ${SCOPESLIB_LDFLAGS}
20 ${GSETTINGSQT_LDFLAGS}18 ${GSETTINGSQT_LDFLAGS}
21 )
22\ No newline at end of file19\ No newline at end of file
20 )

Subscribers

People subscribed via source and target branches

to all changes: