Compiz

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

  1. cmp0000
  2. Merge into 0.9.13
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 4174
Merged at revision: 4174
Proposed branch: lp:~muktupavels/compiz/cmp0000
Merge into: lp:compiz/0.9.13
Diff against target: 24 lines (+2/-1)
2 files modified
CMakeLists.txt (+2/-0)
cmake/CompizCommon.cmake (+0/-1)
To merge this branch: bzr merge lp:~muktupavels/compiz/cmp0000
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Review via email: mp+350713@code.launchpad.net

Commit message

Don't set CMP0000 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 2015-10-16 17:10:18 +0000
3+++ CMakeLists.txt 2018-07-24 09:18:17 +0000
4@@ -3,6 +3,8 @@
5 #
6 project (compiz C CXX)
7
8+cmake_minimum_required (VERSION 2.6)
9+
10 set (CMAKE_MODULE_PATH_ORIG ${CMAKE_MODULE_PATH})
11 set (COMPIZ_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
12 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${COMPIZ_CMAKE_MODULE_PATH})
13
14=== modified file 'cmake/CompizCommon.cmake'
15--- cmake/CompizCommon.cmake 2018-07-23 10:40:58 +0000
16+++ cmake/CompizCommon.cmake 2018-07-24 09:18:17 +0000
17@@ -12,7 +12,6 @@
18
19 #### policies
20
21-cmake_policy (SET CMP0000 OLD)
22 cmake_policy (SET CMP0002 OLD)
23 cmake_policy (SET CMP0003 NEW)
24 cmake_policy (SET CMP0005 OLD)

Subscribers

People subscribed via source and target branches