unity-mir

Merge lp:~gerboland/unity-mir/fix-readme into lp:unity-mir

  1. fix-readme
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Michał Sawicz
Approved revision: 171
Merged at revision: 175
Proposed branch: lp:~gerboland/unity-mir/fix-readme
Merge into: lp:unity-mir
Diff against target: 21 lines (+4/-4)
1 file modified
README (+4/-4)
To merge this branch: bzr merge lp:~gerboland/unity-mir/fix-readme
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+204572@code.launchpad.net

Commit message

Update README for cmake instructions

Description of the change

• Are there any related MPs required for this MP to build/function as expected? Please list.
No

• Did you perform an exploratory manual test run of your code change and any related functionality?
No, it's only changing a README file which is not installed on the device nor has any impact on the binaries.

• If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not required

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:171
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/239/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/103
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/103/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/102

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/239/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, confirmed that the new README pointers work.

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2013-06-17 21:16:29 +0000
3+++ README 2014-02-03 20:49:59 +0000
4@@ -12,13 +12,13 @@
5 2. Building
6 -----------
7
8- To compile Unity-Mir, create the makefiles with qmake and build with
9+ To compile Unity-Mir, create the makefiles with cmake and build with
10 make:
11
12- $ qmake
13+ $ cmake . -DCMAKE_INSTALL_PREFIX=/usr
14 $ make
15
16 By default, Unity-Mir compiles a release build. To compile a debug
17- build, the following qmake command should be used:
18+ build, the following cmake command should be used:
19
20- $ qmake CONFIG+=debug
21+ $ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug

Subscribers

People subscribed via source and target branches