Merge lp:~pimvullers/noise/fix-1020802 into lp:~elementary-apps/noise/trunk

Proposed by Pim Vullers
Status: Merged
Merged at revision: 837
Proposed branch: lp:~pimvullers/noise/fix-1020802
Merge into: lp:~elementary-apps/noise/trunk
Diff against target: 19 lines (+2/-0)
1 file modified
CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~pimvullers/noise/fix-1020802
Reviewer Review Type Date Requested Status
Victor Martinez (community) Approve
Review via email: mp+113327@code.launchpad.net

Commit message

Description of the change

Fixed bug #1020802 by expliciting setting GUPNP_FOUND and GUPNP_AV_FOUND to '0' if not found.

To post a comment you must log in.
Revision history for this message
Victor Martinez (victored) wrote :

Thanks for the fix

review: Approve

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 2012-06-29 11:38:45 +0000
3+++ CMakeLists.txt 2012-07-04 04:06:17 +0000
4@@ -59,6 +59,7 @@
5 message("-- UPnP Plugin enabled")
6 else()
7 message("-- UPnP Plugin disabled")
8+set(GUPNP_FOUND 0)
9 endif()
10
11 pkg_check_modules(GUPNP_AV gupnp-av-1.0)
12@@ -69,6 +70,7 @@
13 message("-- UPnP Plugin enabled")
14 else()
15 message("-- UPnP Plugin disabled")
16+set(GUPNP_AV_FOUND 0)
17 endif()
18
19 pkg_check_modules(INDICATE indicate-0.7)

Subscribers

People subscribed via source and target branches