Midori Web Browser

Merge lp:~midori/midori/zeitgeistRequired into lp:midori

  1. zeitgeistRequired
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 7099
Merged at revision: 7100
Proposed branch: lp:~midori/midori/zeitgeistRequired
Merge into: lp:midori
Diff against target: 12 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~midori/midori/zeitgeistRequired
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+285110@code.launchpad.net

Commit message

Make configure fail early if library is not found with zeitgeist enabled

Description of the change

Without the REQUIRED the build actually continues until somewhere in the middle of the build headers and vapi's are missing.

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-08-30 10:19:52 +0000
+++ CMakeLists.txt 2016-02-04 20:07:17 +0000
@@ -168,7 +168,7 @@
168endif()168endif()
169169
170if (USE_ZEITGEIST)170if (USE_ZEITGEIST)
171 pkg_check_modules(ZEITGEIST zeitgeist-2.0>=0.3.14)171 pkg_check_modules(ZEITGEIST REQUIRED zeitgeist-2.0>=0.3.14)
172 set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${ZEITGEIST_INCLUDE_DIRS}")172 set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${ZEITGEIST_INCLUDE_DIRS}")
173 set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${ZEITGEIST_LIBRARIES}")173 set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${ZEITGEIST_LIBRARIES}")
174 add_definitions("-DHAVE_ZEITGEIST")174 add_definitions("-DHAVE_ZEITGEIST")

Subscribers

People subscribed via source and target branches

to all changes: