Compiz

Merge lp:~vanvugt/compiz/fix-1096780 into lp:compiz/0.9.9

  1. fix-1096780
  2. Merge into 0.9.9
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3542
Merged at revision: 3546
Proposed branch: lp:~vanvugt/compiz/fix-1096780
Merge into: lp:compiz/0.9.9
Prerequisite: lp:~vanvugt/compiz/fix-1083027
Diff against target: 11 lines (+1/-0)
1 file modified
cmake/CompizPackage.cmake (+1/-0)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1096780
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Sam Spilsbury Approve
Review via email: mp+142067@code.launchpad.net

Commit message

Sort the plugin list to improve readability of CMake output (LP: #1096780)

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Sure why not.

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

PASSED: Continuous integration, rev:3542
http://jenkins.qa.ubuntu.com/job/compiz-ci/349/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/349/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/349//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/CompizPackage.cmake'
2--- cmake/CompizPackage.cmake 2013-01-07 08:24:24 +0000
3+++ cmake/CompizPackage.cmake 2013-01-07 08:24:24 +0000
4@@ -52,6 +52,7 @@
5 RELATIVE "${_folder}"
6 "${_folder}/*/CMakeLists.txt"
7 )
8+ list (SORT _plugins_in)
9 foreach (_plugin ${_plugins_in})
10 file (READ "${_folder}/${_plugin}" _file)
11 if (_file MATCHES "^.*compiz_plugin ?\\(([^\\)\r\n ]*).*$")

Subscribers

People subscribed via source and target branches