Merge lp:~aacid/unity-scopes-api/cmakewarnings into lp:unity-scopes-api

Proposed by Albert Astals Cid
Status: Rejected
Rejected by: Albert Astals Cid
Proposed branch: lp:~aacid/unity-scopes-api/cmakewarnings
Merge into: lp:unity-scopes-api
Diff against target: 12 lines (+2/-0)
1 file modified
CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~aacid/unity-scopes-api/cmakewarnings
Reviewer Review Type Date Requested Status
Michi Henning (community) Needs Information
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+242904@code.launchpad.net

Commit message

Fix CMake warnings

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

I checked in a fix for this recently already, to devel, but that fix maybe hasn't merged yet? Were you building from trunk or from devel?

You get the warnings due to a change in behaviour in cmake, added with 3.0.2.

Adding this dependency to the top-level CMakeLists.txt isn't the right thing because libunity-scopes-api doesn't use these libs; only the static library for the smartscopesproxy does and, for that, the dependency is already in place.

If you grab devel, you won't see the warning any longer. I'd like to change cmake_minimum_required() to 3.0.2 but, last time I looked, that wasn't available on Jenkins.

review: Needs Information
Revision history for this message
Albert Astals Cid (aacid) wrote :

I am using trunk, no idea there's a devel branch :) Trunk has always sounded devel enough to me :D

Yes the warning is gone in devel

Unmerged revisions

262. By Albert Astals Cid

Fix CMake warnings

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 2014-10-22 15:46:36 +0000
3+++ CMakeLists.txt 2014-11-26 11:08:14 +0000
4@@ -61,6 +61,8 @@
5
6 include(FindPkgConfig)
7 find_package(Boost COMPONENTS system filesystem regex serialization REQUIRED)
8+find_package(Qt5Core 5.3 REQUIRED)
9+find_package(Qt5Network 5.3 REQUIRED)
10 pkg_check_modules(UNITY_API libunity-api>=0.1.3 REQUIRED)
11 pkg_check_modules(PROCESS_CPP process-cpp>=1.0.1 REQUIRED)
12 pkg_check_modules(APPARMOR REQUIRED libapparmor REQUIRED)

Subscribers

People subscribed via source and target branches

to all changes: