Merge lp://staging/~muktupavels/compiz/cmake-3.10 into lp://staging/compiz/0.9.13

Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 4211
Merged at revision: 4200
Proposed branch: lp://staging/~muktupavels/compiz/cmake-3.10
Merge into: lp://staging/compiz/0.9.13
Diff against target: 286 lines (+28/-67)
18 files modified
CMakeLists.txt (+9/-1)
cmake/CompizCommon.cmake (+11/-5)
cmake/FindXorgGTest.cmake (+4/-18)
compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt (+0/-2)
compizconfig/gsettings/tests/CMakeLists.txt (+0/-1)
compizconfig/integration/gnome/CMakeLists.txt (+0/-2)
compizconfig/integration/gnome/gsettings/CMakeLists.txt (+0/-2)
compizconfig/integration/mate/CMakeLists.txt (+0/-2)
compizconfig/integration/mate/gsettings/CMakeLists.txt (+0/-2)
debian/control (+3/-3)
plugins/composite/src/pixmapbinding/CMakeLists.txt (+0/-2)
plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt (+0/-3)
plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt (+0/-3)
plugins/notification/CMakeLists.txt (+1/-4)
plugins/notification/src/notification.cpp (+0/-10)
tests/integration/glib/CMakeLists.txt (+0/-2)
tests/system/untest/CMakeLists.txt (+0/-3)
tests/xorg-gtest/communicator/CMakeLists.txt (+0/-2)
To merge this branch: bzr merge lp://staging/~muktupavels/compiz/cmake-3.10
Reviewer Review Type Date Requested Status
Dmitry Shachnev Pending
Review via email: mp+362743@code.staging.launchpad.net

Commit message

Clean up CMake files, and bump required version to 3.10.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) :
4210. By Alberts Muktupāvels

Use 4 spaces.

4211. By Alberts Muktupāvels

Remove whitespace.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches