Compiz

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

  1. cmp0002
  2. Merge into 0.9.13
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 4181
Merged at revision: 4179
Proposed branch: lp:~muktupavels/compiz/cmp0002
Merge into: lp:compiz/0.9.13
Prerequisite: lp:~muktupavels/compiz/cmp0022
Diff against target: 24 lines (+1/-4)
2 files modified
cmake/CompizCommon.cmake (+0/-4)
tests/xorg-gtest/plugins/testhelper/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~muktupavels/compiz/cmp0002
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Review via email: mp+350723@code.launchpad.net

Commit message

Don't set CMP0002 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 'cmake/CompizCommon.cmake'
2--- cmake/CompizCommon.cmake 2018-07-24 13:56:28 +0000
3+++ cmake/CompizCommon.cmake 2018-07-24 13:56:28 +0000
4@@ -10,10 +10,6 @@
5 #### CTest
6 enable_testing()
7
8-#### policies
9-
10-cmake_policy (SET CMP0002 OLD)
11-
12 set (CMAKE_SKIP_RPATH FALSE)
13
14 pkg_check_modules (GL QUIET gl)
15
16=== modified file 'tests/xorg-gtest/plugins/testhelper/CMakeLists.txt'
17--- tests/xorg-gtest/plugins/testhelper/CMakeLists.txt 2013-02-20 09:42:29 +0000
18+++ tests/xorg-gtest/plugins/testhelper/CMakeLists.txt 2018-07-24 13:56:28 +0000
19@@ -4,4 +4,5 @@
20
21 include_directories (${COMPIZ_XORG_GTEST_COMMUNICATOR_INCLUDE_DIR})
22
23+set (COMPIZ_PLUGIN_PACK_BUILD 1)
24 compiz_plugin (testhelper NOINSTALL LIBRARIES ${COMPIZ_XORG_GTEST_COMMUNICATOR_LIBRARY})

Subscribers

People subscribed via source and target branches