Compiz

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

  1. cmp0011
  2. Merge into 0.9.13
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 4179
Merged at revision: 4177
Proposed branch: lp:~muktupavels/compiz/cmp0011
Merge into: lp:compiz/0.9.13
Prerequisite: lp:~muktupavels/compiz/cmp0005
Diff against target: 70 lines (+5/-9)
5 files modified
CMakeLists.txt (+1/-1)
cmake/CompizCommon.cmake (+1/-2)
compizconfig/gsettings/CMakeLists.txt (+2/-2)
tests/system/untest/CMakeLists.txt (+1/-1)
tests/xorg-gtest/CMakeLists.txt (+0/-3)
To merge this branch: bzr merge lp:~muktupavels/compiz/cmp0011
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Review via email: mp+350718@code.launchpad.net

Commit message

Don't set CMP0011 policy to OLD.

Description of the change

Bumping required version to 2.6.3 introduced two CMP0002 errors that are also fixed here.

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:25:21 +0000
3+++ CMakeLists.txt 2018-07-24 10:25:21 +0000
4@@ -3,7 +3,7 @@
5 #
6 project (compiz C CXX)
7
8-cmake_minimum_required (VERSION 2.6)
9+cmake_minimum_required (VERSION 2.6.3)
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:25:21 +0000
16+++ cmake/CompizCommon.cmake 2018-07-24 10:25:21 +0000
17@@ -1,4 +1,4 @@
18-cmake_minimum_required (VERSION 2.6)
19+cmake_minimum_required (VERSION 2.6.3)
20
21 include (FindPkgConfig)
22
23@@ -13,7 +13,6 @@
24 #### policies
25
26 cmake_policy (SET CMP0002 OLD)
27-cmake_policy (SET CMP0011 OLD)
28 cmake_policy (SET CMP0022 OLD)
29
30 set (CMAKE_SKIP_RPATH FALSE)
31
32=== modified file 'compizconfig/gsettings/CMakeLists.txt'
33--- compizconfig/gsettings/CMakeLists.txt 2015-12-10 16:34:35 +0000
34+++ compizconfig/gsettings/CMakeLists.txt 2018-07-24 10:25:21 +0000
35@@ -46,10 +46,10 @@
36 DEPENDS ${_top_gschema_src}
37 VERBATIM)
38
39- add_custom_target (compiz_gsettings_schema
40+ add_custom_target (compiz_config_gsettings_schema
41 DEPENDS ${_top_gschema_dest})
42
43- add_gsettings_schema_to_recompilation_list (compiz_gsettings_schema)
44+ add_gsettings_schema_to_recompilation_list (compiz_config_gsettings_schema)
45
46 compiz_install_gsettings_schema (${_top_gschema_dest}
47 ${_top_gschema_inst})
48
49=== modified file 'tests/system/untest/CMakeLists.txt'
50--- tests/system/untest/CMakeLists.txt 2012-11-14 10:17:09 +0000
51+++ tests/system/untest/CMakeLists.txt 2018-07-24 10:25:21 +0000
52@@ -1,4 +1,4 @@
53-cmake_minimum_required (VERSION 2.6)
54+cmake_minimum_required (VERSION 2.6.3)
55
56 include (FindPkgConfig)
57 pkg_check_modules (COMPIZ_UNTEST REQUIRED gtk+-3.0 gl x11)
58
59=== modified file 'tests/xorg-gtest/CMakeLists.txt'
60--- tests/xorg-gtest/CMakeLists.txt 2013-06-28 01:10:57 +0000
61+++ tests/xorg-gtest/CMakeLists.txt 2018-07-24 10:25:21 +0000
62@@ -54,8 +54,5 @@
63 ${COMPIZ_XORG_GTEST_COMMUNICATOR_LIBRARY}
64 ${X11_XI_LIBRARIES})
65
66-add_executable (xorg_gtest_wrapper
67- ${CMAKE_CURRENT_SOURCE_DIR}/src/xorg_gtest_wrapper.cpp)
68-
69 add_subdirectory (communicator)
70 add_subdirectory (plugins)

Subscribers

People subscribed via source and target branches