Merge lp:~aacid/unity8/make_cmake_happy into lp:unity8

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Zanetti
Approved revision: 1433
Merged at revision: 1443
Proposed branch: lp:~aacid/unity8/make_cmake_happy
Merge into: lp:unity8
Diff against target: 23 lines (+2/-1)
2 files modified
CMakeLists.txt (+1/-0)
plugins/Utils/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/make_cmake_happy
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michael Zanetti (community) Approve
Review via email: mp+241574@code.launchpad.net

Commit message

Fix a few cmake warnings when running ./build.sh in a clean checkout

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
cmake is now happier

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Michael Zanetti (mzanetti) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes. builds fine still, shuts up with warnings

 * Did CI run pass? If not, please explain why.

waiting, bug very unlikely CI fails on this

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

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-14 15:53:45 +0000
3+++ CMakeLists.txt 2014-11-12 15:55:08 +0000
4@@ -53,6 +53,7 @@
5 find_package(Qt5Quick 5.2 REQUIRED)
6 find_package(Qt5Gui 5.2 REQUIRED)
7 find_package(Qt5DBus 5.2 REQUIRED)
8+find_package(Qt5Concurrent 5.2 REQUIRED)
9
10 # Standard install paths
11 include(GNUInstallDirs)
12
13=== modified file 'plugins/Utils/CMakeLists.txt'
14--- plugins/Utils/CMakeLists.txt 2014-07-31 13:12:29 +0000
15+++ plugins/Utils/CMakeLists.txt 2014-11-12 15:55:08 +0000
16@@ -33,6 +33,6 @@
17 # files directly in targets.
18 set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
19
20-qt5_use_modules(Utils-qml Qml Quick DBus Network XmlPatterns Gui Concurrent)
21+qt5_use_modules(Utils-qml Qml Quick DBus Network Gui)
22
23 add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)

Subscribers

People subscribed via source and target branches