Merge lp:~compiz-team/compiz/compiz.fix_1018916 into lp:compiz/0.9.8

Proposed by Sam Spilsbury on 2012-06-28
Status: Merged
Merged at revision: 3264
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1018916
Merge into: lp:compiz/0.9.8
Diff against target: 12 lines (+0/-2)
1 file modified
compizconfig/cmake/exec_setup_py_with_destdir.cmake (+0/-2)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1018916
Reviewer Review Type Date Requested Status
Daniel van Vugt 2012-06-28 Approve on 2012-06-29
Review via email: mp+112605@code.launchpad.net

Commit message

Don't print the result of BUILD_DEB (LP: #1018916)

Description of the change

== Problem ==

compizconfig-python and ccsm weren't installing

== Solution ==

Remove message ({$BUILD_DEB}), which could be unset and cause cmake errors

== Test ==

Build.

To post a comment you must log in.
Daniel van Vugt (vanvugt) wrote :

Tested, works!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/cmake/exec_setup_py_with_destdir.cmake'
2--- compizconfig/cmake/exec_setup_py_with_destdir.cmake 2012-05-27 14:25:30 +0000
3+++ compizconfig/cmake/exec_setup_py_with_destdir.cmake 2012-06-28 16:36:08 +0000
4@@ -15,8 +15,6 @@
5
6 cmake_policy (SET CMP0012 NEW)
7
8-message (${BUILD_DEB})
9-
10 if (BUILD_DEB)
11 message ("Installing Debian Format")
12 set (EXTRAARGS "--install-layout=deb")

Subscribers

People subscribed via source and target branches