Compiz

Merge lp:~muktupavels/compiz/cmp0022 into lp:compiz/0.9.13

  1. cmp0022
  2. Merge into 0.9.13
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 4180
Merged at revision: 4178
Proposed branch: lp:~muktupavels/compiz/cmp0022
Merge into: lp:compiz/0.9.13
Prerequisite: lp:~muktupavels/compiz/cmp0011
Diff against target: 66 lines (+5/-6)
5 files modified
CMakeLists.txt (+1/-1)
cmake/CompizCommon.cmake (+1/-2)
debian/control (+1/-1)
src/CMakeLists.txt (+1/-1)
tests/system/untest/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~muktupavels/compiz/cmp0022
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Review via email: mp+350719@code.launchpad.net

Commit message

Don't set CMP0022 policy to OLD.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) :
review: Approve

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 2018-07-24 10:34:32 +0000
3+++ CMakeLists.txt 2018-07-24 10:34:32 +0000
4@@ -3,7 +3,7 @@
5 #
6 project (compiz C CXX)
7
8-cmake_minimum_required (VERSION 2.6.3)
9+cmake_minimum_required (VERSION 2.8.12)
10
11 set (CMAKE_MODULE_PATH_ORIG ${CMAKE_MODULE_PATH})
12 set (COMPIZ_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
13
14=== modified file 'cmake/CompizCommon.cmake'
15--- cmake/CompizCommon.cmake 2018-07-24 10:34:32 +0000
16+++ cmake/CompizCommon.cmake 2018-07-24 10:34:32 +0000
17@@ -1,4 +1,4 @@
18-cmake_minimum_required (VERSION 2.6.3)
19+cmake_minimum_required (VERSION 2.8.12)
20
21 include (FindPkgConfig)
22
23@@ -13,7 +13,6 @@
24 #### policies
25
26 cmake_policy (SET CMP0002 OLD)
27-cmake_policy (SET CMP0022 OLD)
28
29 set (CMAKE_SKIP_RPATH FALSE)
30
31
32=== modified file 'debian/control'
33--- debian/control 2018-07-19 00:55:26 +0000
34+++ debian/control 2018-07-24 10:34:32 +0000
35@@ -4,7 +4,7 @@
36 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
37 XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
38 Uploaders: David Nusinow <dnusinow@debian.org>, Sean Finney <seanius@debian.org>, Cyril Brulebois <kibi@debian.org>
39-Build-Depends: cmake (>= 2.8.5),
40+Build-Depends: cmake (>= 2.8.12),
41 debhelper (>= 9~),
42 dh-migrations,
43 dh-translations,
44
45=== modified file 'src/CMakeLists.txt'
46--- src/CMakeLists.txt 2018-07-24 10:34:32 +0000
47+++ src/CMakeLists.txt 2018-07-24 10:34:32 +0000
48@@ -208,7 +208,7 @@
49 # libraries that compiz_core depends on (contains).
50 #
51 set_target_properties (compiz_core PROPERTIES
52- LINK_INTERFACE_LIBRARIES ""
53+ INTERFACE_LINK_LIBRARIES ""
54 )
55
56 target_link_libraries (
57
58=== modified file 'tests/system/untest/CMakeLists.txt'
59--- tests/system/untest/CMakeLists.txt 2018-07-24 10:34:32 +0000
60+++ tests/system/untest/CMakeLists.txt 2018-07-24 10:34:32 +0000
61@@ -1,4 +1,4 @@
62-cmake_minimum_required (VERSION 2.6.3)
63+cmake_minimum_required (VERSION 2.8.12)
64
65 include (FindPkgConfig)
66 pkg_check_modules (COMPIZ_UNTEST REQUIRED gtk+-3.0 gl x11)

Subscribers

People subscribed via source and target branches