Compiz Core

Merge lp:~vanvugt/compiz-core/fix-993608 into lp:compiz-core/0.9.8

  1. fix-993608
  2. Merge into 0.9.8
Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 3126
Proposed branch: lp:~vanvugt/compiz-core/fix-993608
Merge into: lp:compiz-core/0.9.8
Diff against target: 16 lines (+7/-0)
1 file modified
cmake/FindCompiz.cmake (+7/-0)
To merge this branch: bzr merge lp:~vanvugt/compiz-core/fix-993608
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
Alan Griffiths Approve
Review via email: mp+104474@code.launchpad.net

Description of the change

Don't assume pkg_check_modules always sets _PREFIX (LP: #993608)

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) :
review: Approve
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/FindCompiz.cmake'
2--- cmake/FindCompiz.cmake 2011-02-24 02:29:00 +0000
3+++ cmake/FindCompiz.cmake 2012-05-02 23:59:19 +0000
4@@ -74,6 +74,13 @@
5 # look for compiz
6 pkg_check_modules (COMPIZ ${_req} "compiz${_comp_ver}")
7
8+ # COMPIZ_PREFIX is not set by default on all machines. The CMake docs
9+ # seem to vagely suggest this is normal in some cases for
10+ # pkg_check_modules.
11+ if (NOT COMPIZ_PREFIX)
12+ set (COMPIZ_PREFIX ${CMAKE_INSTALL_PREFIX})
13+ endif ()
14+
15 # is the CompizDefaults module installed?
16 find_path(_compiz_def_macro CompizDefaults.cmake ${COMPIZ_PREFIX}/share/compiz/cmake)
17

Subscribers

People subscribed via source and target branches