Unity 8

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

  1. morefpic
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-01-12
Status: Merged
Approved by: Michał Sawicz on 2015-01-13
Approved revision: 1545
Merged at revision: 1551
Proposed branch: lp:~aacid/unity8/morefpic
Merge into: lp:unity8
Diff against target: 10 lines (+1/-0)
1 file modified
tests/mocks/LightDM/demo/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~aacid/unity8/morefpic
Reviewer Review Type Date Requested Status
Michał Sawicz 2015-01-12 Approve on 2015-01-13
Dmitry Shachnev Approve on 2015-01-13
PS Jenkins bot continuous-integration Needs Fixing on 2015-01-12
Review via email: mp+246108@code.launchpad.net

Commit Message

Make sure we use fPIC when compiling files for the static library too

Fixes compilation in ARM + Qt 5.4

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?
No, just compiled

 * 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/mocks/LightDM/demo/CMakeLists.txt'
2--- tests/mocks/LightDM/demo/CMakeLists.txt 2014-07-28 12:56:55 +0000
3+++ tests/mocks/LightDM/demo/CMakeLists.txt 2015-01-12 10:46:32 +0000
4@@ -28,6 +28,7 @@
5 qt5_use_modules(MockLightDM-demo Concurrent Gui)
6 qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
7
8+set_target_properties(MockLightDM-demo PROPERTIES COMPILE_FLAGS -fPIC)
9 set_target_properties(MockLightDM-demo-shared PROPERTIES
10 OUTPUT_NAME lightdm-qt5-2)
11

Subscribers

People subscribed via source and target branches