Compiz

Merge lp:~compiz-team/compiz/compiz.fix_1124313 into lp:compiz/0.9.9

  1. compiz.fix_1124313
  2. Merge into 0.9.9
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1124313
Merge into: lp:compiz/0.9.9
Diff against target: 12 lines (+0/-2)
1 file modified
CMakeLists.txt (+0/-2)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1124313
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Łukasz Zemczak Approve
Andrea Azzarone Approve
Review via email: mp+148193@code.launchpad.net

This proposal has been superseded by a proposal from 2013-02-14.

Commit message

We don't need CMAKE_THREADS_LIB

(LP: #1124133)

Description of the change

We don't need CMAKE_THREADS_LIB

(LP: #1124133)

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) :
review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Yep, looking good, waiting for CI. But now it's +1.

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

FAILED: Continuous integration, rev:3607
http://jenkins.qa.ubuntu.com/job/compiz-ci/31/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=raring,flavor=amd64/69/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/68/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/420/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/31//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Okay, the clang-job is stuffed because the compiler crashes on compiling google-test :( . I've asked mmrazik to disable google

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

*google-test compilation. Yikes, dunno what the world would be like if we disabled "google"

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3607
http://jenkins.qa.ubuntu.com/job/compiz-ci/38/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=raring,flavor=amd64/76/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/75/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/427/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/38//rebuild/?

review: Needs Fixing (continuous-integration)

Unmerged revisions

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-11-05 20:50:59 +0000
3+++ CMakeLists.txt 2013-02-13 14:02:28 +0000
4@@ -179,8 +179,6 @@
5
6 endif (COMPIZ_BUILD_TESTING)
7
8-find_package (Threads REQUIRED)
9-
10 # Add the rest of compiz
11 add_subdirectory (cmake)
12 add_subdirectory (include)

Subscribers

People subscribed via source and target branches