Compiz

Merge lp:~hikiko/compiz/compiz-0.9.11.cmake-syntax-error into lp:compiz/0.9.11

  1. compiz-0.9.11.cmake-syntax-error
  2. Merge into 0.9.11
Proposed by Eleni Maria Stea
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3803
Merged at revision: 3805
Proposed branch: lp:~hikiko/compiz/compiz-0.9.11.cmake-syntax-error
Merge into: lp:compiz/0.9.11
Diff against target: 18 lines (+2/-2)
1 file modified
cmake/CompizCommon.cmake (+2/-2)
To merge this branch: bzr merge lp:~hikiko/compiz/compiz-0.9.11.cmake-syntax-error
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Christopher Townsend (community) Approve
Review via email: mp+194811@code.launchpad.net

Commit message

fixed cmake syntax errors

Description of the change

fixed cmake syntax errors

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

Good, thanks. +1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-autolanding/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-autolanding/8
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-autolanding/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-autolanding/8
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/3202/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3803
http://jenkins.qa.ubuntu.com/job/compiz-ci/305/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/118

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/305/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3803
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-0.9.11-ci/7/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/CompizCommon.cmake'
2--- cmake/CompizCommon.cmake 2013-06-05 07:47:16 +0000
3+++ cmake/CompizCommon.cmake 2013-11-12 08:48:21 +0000
4@@ -402,12 +402,12 @@
5 if (AUTO_NEWS_UPDATE)
6
7 add_custom_target (news-header echo > ${CMAKE_BINARY_DIR}/NEWS.update
8- COMMAND echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`bzr config email`')' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo '${AUTO_NEWS_UPDATE}' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
9+ COMMAND echo "Release ${VERSION} ('`date +%Y-%m-%d`' '`bzr config email`')" > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo '${AUTO_NEWS_UPDATE}' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
10 COMMENT "Generating NEWS Header"
11 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
12 else (AUTO_NEWS_UPDATE)
13 add_custom_target (news-header echo > ${CMAKE_BINARY_DIR}/NEWS.update
14- COMMAND echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`bzr config email`')' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && $ENV{EDITOR} ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
15+ COMMAND echo "Release ${VERSION} ('`date +%Y-%m-%d`' '`bzr config email`')" > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && $ENV{EDITOR} ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
16 COMMENT "Generating NEWS Header"
17 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
18 endif (AUTO_NEWS_UPDATE)

Subscribers

People subscribed via source and target branches