Merge lp:~josharenson/unity8/fix_xcompile into lp:unity8

Proposed by Josh Arenson
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1704
Merged at revision: 1722
Proposed branch: lp:~josharenson/unity8/fix_xcompile
Merge into: lp:unity8
Diff against target: 8 lines (+0/-1)
1 file modified
plugins/Greeter/Unity/Launcher/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~josharenson/unity8/fix_xcompile
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+254671@code.launchpad.net

Commit message

Remove PkgConfig include from Launcher plugin to fix cross-compile

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?
Yes

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Greeter/Unity/Launcher/CMakeLists.txt'
2--- plugins/Greeter/Unity/Launcher/CMakeLists.txt 2015-02-11 13:43:17 +0000
3+++ plugins/Greeter/Unity/Launcher/CMakeLists.txt 2015-03-31 01:30:14 +0000
4@@ -1,4 +1,3 @@
5-include(FindPkgConfig)
6 pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
7 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
8 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

Subscribers

People subscribed via source and target branches