Compiz

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

  1. cmake-3.10
  2. Merge into 0.9.13
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 4211
Merged at revision: 4200
Proposed branch: lp:~muktupavels/compiz/cmake-3.10
Merge into: lp: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:~muktupavels/compiz/cmake-3.10
Reviewer Review Type Date Requested Status
Dmitry Shachnev Pending
Review via email: mp+362743@code.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) :
lp:~muktupavels/compiz/cmake-3.10 updated
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
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2019-02-04 20:24:41 +0000
3+++ CMakeLists.txt 2019-02-05 20:40:50 +0000
4@@ -3,7 +3,15 @@
5 #
6 project (compiz C CXX)
7
8-cmake_minimum_required (VERSION 2.8.12)
9+cmake_minimum_required (VERSION 3.10.0)
10+
11+if (POLICY CMP0072)
12+ cmake_policy (SET CMP0072 OLD)
13+endif ()
14+
15+if (POLICY CMP0077)
16+ cmake_policy (SET CMP0077 NEW)
17+endif ()
18
19 set (CMAKE_MODULE_PATH_ORIG ${CMAKE_MODULE_PATH})
20 set (COMPIZ_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
21
22=== modified file 'cmake/CompizCommon.cmake'
23--- cmake/CompizCommon.cmake 2019-02-04 20:24:41 +0000
24+++ cmake/CompizCommon.cmake 2019-02-05 20:40:50 +0000
25@@ -1,6 +1,14 @@
26-cmake_minimum_required (VERSION 2.8.12)
27-
28-include (FindPkgConfig)
29+cmake_minimum_required (VERSION 3.10.0)
30+
31+if (POLICY CMP0072)
32+ cmake_policy (SET CMP0072 OLD)
33+endif ()
34+
35+if (POLICY CMP0077)
36+ cmake_policy (SET CMP0077 NEW)
37+endif ()
38+
39+find_package (PkgConfig 0.29.1 REQUIRED)
40
41 if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
42 message (SEND_ERROR "Building in the source directory is not supported.")
43@@ -494,8 +502,6 @@
44
45 #### pkg-config handling
46
47-include (FindPkgConfig)
48-
49 function (compiz_pkg_check_modules _var _req)
50 if (NOT ${_var})
51 pkg_check_modules (${_var} ${_req} ${ARGN})
52
53=== modified file 'cmake/FindXorgGTest.cmake'
54--- cmake/FindXorgGTest.cmake 2015-12-10 15:20:13 +0000
55+++ cmake/FindXorgGTest.cmake 2019-02-05 20:40:50 +0000
56@@ -12,24 +12,10 @@
57 xi)
58
59 if (XORG_SERVER_FOUND)
60-
61- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix xorg-gtest OUTPUT_VARIABLE _xorg_gtest_prefix)
62- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=includedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_include_dir)
63- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=sourcedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_source_dir)
64- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CPPflags xorg-gtest OUTPUT_VARIABLE _xorg_gtest_cflags)
65-
66- string (STRIP ${_xorg_gtest_prefix} _xorg_gtest_prefix)
67- string (STRIP ${_xorg_gtest_include_dir} _xorg_gtest_include_dir)
68- string (STRIP ${_xorg_gtest_source_dir} _xorg_gtest_source_dir)
69- string (STRIP ${_xorg_gtest_cflags} _xorg_gtest_cflags)
70-
71- # This is a workaround for bug #1521366 caused by recent pkg-config variables unquoting
72- set (_unescaped_double_quote "([^\\])\\\"")
73- set (_escaped_double_quote "\\1\\\\\"")
74- string (REGEX REPLACE ${_unescaped_double_quote} ${_escaped_double_quote} _xorg_gtest_prefix ${_xorg_gtest_prefix})
75- string (REGEX REPLACE ${_unescaped_double_quote} ${_escaped_double_quote} _xorg_gtest_include_dir ${_xorg_gtest_include_dir})
76- string (REGEX REPLACE ${_unescaped_double_quote} ${_escaped_double_quote} _xorg_gtest_source_dir ${_xorg_gtest_source_dir})
77- string (REGEX REPLACE ${_unescaped_double_quote} ${_escaped_double_quote} _xorg_gtest_cflags ${_xorg_gtest_cflags})
78+ pkg_get_variable (_xorg_gtest_prefix xorg-gtest prefix)
79+ pkg_get_variable (_xorg_gtest_include_dir xorg-gtest includedir)
80+ pkg_get_variable (_xorg_gtest_source_dir xorg-gtest sourcedir)
81+ pkg_get_variable (_xorg_gtest_cflags xorg-gtest CPPflags)
82
83 set (XORG_SERVER_GTEST_INCLUDES ${XORG_SERVER_INCLUDE_DIRS})
84 set (XORG_SERVER_GTEST_LIBRARY_DIRS ${XORG_SERVER_LIBRARIES})
85
86=== modified file 'compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt'
87--- compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt 2015-12-10 16:34:35 +0000
88+++ compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt 2019-02-05 20:40:50 +0000
89@@ -1,5 +1,3 @@
90-include (FindPkgConfig)
91-
92 compiz_pkg_check_modules (GSETTINGS_UTIL ${_deps})
93
94 if (GSETTINGS_UTIL_FOUND)
95
96=== modified file 'compizconfig/gsettings/tests/CMakeLists.txt'
97--- compizconfig/gsettings/tests/CMakeLists.txt 2015-07-30 19:56:19 +0000
98+++ compizconfig/gsettings/tests/CMakeLists.txt 2019-02-05 20:40:50 +0000
99@@ -1,4 +1,3 @@
100-include (FindPkgConfig)
101 include (CompizGSettings)
102
103 include_directories (${CMAKE_CURRENT_SOURCE_DIR}
104
105=== modified file 'compizconfig/integration/gnome/CMakeLists.txt'
106--- compizconfig/integration/gnome/CMakeLists.txt 2015-12-10 16:34:35 +0000
107+++ compizconfig/integration/gnome/CMakeLists.txt 2019-02-05 20:40:50 +0000
108@@ -1,5 +1,3 @@
109-include (FindPkgConfig)
110-
111 add_subdirectory (gsettings)
112
113 set (_deps
114
115=== modified file 'compizconfig/integration/gnome/gsettings/CMakeLists.txt'
116--- compizconfig/integration/gnome/gsettings/CMakeLists.txt 2016-05-12 10:14:55 +0000
117+++ compizconfig/integration/gnome/gsettings/CMakeLists.txt 2019-02-05 20:40:50 +0000
118@@ -1,5 +1,3 @@
119-include (FindPkgConfig)
120-
121 set (_deps
122 glib-2.0>=2.20.0
123 gio-2.0>=2.25.0)
124
125=== modified file 'compizconfig/integration/mate/CMakeLists.txt'
126--- compizconfig/integration/mate/CMakeLists.txt 2015-12-10 16:34:35 +0000
127+++ compizconfig/integration/mate/CMakeLists.txt 2019-02-05 20:40:50 +0000
128@@ -1,5 +1,3 @@
129-include (FindPkgConfig)
130-
131 add_subdirectory (gsettings)
132
133 set (_deps
134
135=== modified file 'compizconfig/integration/mate/gsettings/CMakeLists.txt'
136--- compizconfig/integration/mate/gsettings/CMakeLists.txt 2016-05-12 10:14:55 +0000
137+++ compizconfig/integration/mate/gsettings/CMakeLists.txt 2019-02-05 20:40:50 +0000
138@@ -1,5 +1,3 @@
139-include (FindPkgConfig)
140-
141 set (_deps
142 glib-2.0>=2.20.0
143 gio-2.0>=2.25.0)
144
145=== modified file 'debian/control'
146--- debian/control 2019-01-09 16:40:45 +0000
147+++ debian/control 2019-02-05 20:40:50 +0000
148@@ -4,7 +4,7 @@
149 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
150 XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
151 Uploaders: David Nusinow <dnusinow@debian.org>, Sean Finney <seanius@debian.org>, Cyril Brulebois <kibi@debian.org>
152-Build-Depends: cmake (>= 2.8.12),
153+Build-Depends: cmake (>= 3.10.0),
154 debhelper (>= 9~),
155 dh-migrations,
156 dh-python,
157@@ -12,7 +12,7 @@
158 googletest (>= 1.8.0),
159 intltool,
160 libtool,
161- pkg-config,
162+ pkg-config (>= 0.29.1),
163 quilt (>= 0.40),
164 libcairo2-dev,
165 libdbus-glib-1-dev,
166@@ -49,7 +49,7 @@
167 x11proto-gl-dev (>= 1.4.8),
168 libglu1-mesa-dev [!armhf !armel],
169 libjpeg-dev,
170- libnotify-dev,
171+ libnotify-dev (>= 0.7.0),
172 libx11-xcb-dev,
173 libprotobuf-dev,
174 protobuf-compiler,
175
176=== modified file 'plugins/composite/src/pixmapbinding/CMakeLists.txt'
177--- plugins/composite/src/pixmapbinding/CMakeLists.txt 2012-05-31 07:15:37 +0000
178+++ plugins/composite/src/pixmapbinding/CMakeLists.txt 2019-02-05 20:40:50 +0000
179@@ -1,5 +1,3 @@
180-include (FindPkgConfig)
181-
182 PKG_CHECK_MODULES (X11 x11)
183
184 INCLUDE_DIRECTORIES (
185
186=== modified file 'plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt'
187--- plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt 2013-05-10 04:16:30 +0000
188+++ plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt 2019-02-05 20:40:50 +0000
189@@ -1,5 +1,3 @@
190-include (FindPkgConfig)
191-
192 if (BUILD_XORG_GTEST)
193
194 include_directories (${compiz_SOURCE_DIR}/tests/shared
195@@ -37,4 +35,3 @@
196 compiz_decor_pixmap_requests)
197
198 endif (BUILD_XORG_GTEST)
199-
200
201=== modified file 'plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt'
202--- plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt 2013-09-06 16:15:55 +0000
203+++ plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt 2019-02-05 20:40:50 +0000
204@@ -1,5 +1,3 @@
205-include (FindPkgConfig)
206-
207 pkg_check_modules (X11_XI x11 xi xext)
208
209 if (BUILD_XORG_GTEST AND X11_XI_FOUND)
210@@ -38,4 +36,3 @@
211 #compiz_discover_tests (compiz_test_decor_acceptance WITH_XORG_GTEST)
212
213 endif (BUILD_XORG_GTEST AND X11_XI_FOUND)
214-
215
216=== modified file 'plugins/notification/CMakeLists.txt'
217--- plugins/notification/CMakeLists.txt 2014-06-12 19:04:03 +0000
218+++ plugins/notification/CMakeLists.txt 2019-02-05 20:40:50 +0000
219@@ -3,7 +3,4 @@
220 include (CompizPlugin)
221
222 compiz_plugin (notification PKGDEPS libnotify)
223-compiz_pkg_check_modules (HAVE_LIBNOTIFY_0_6_1 libnotify>=0.6.1)
224-if (HAVE_LIBNOTIFY_0_6_1_FOUND)
225- add_definitions (-DHAVE_LIBNOTIFY_0_6_1)
226-endif (HAVE_LIBNOTIFY_0_6_1_FOUND)
227+pkg_check_modules (LIBNOTIFY libnotify>=0.7.0)
228
229=== modified file 'plugins/notification/src/notification.cpp'
230--- plugins/notification/src/notification.cpp 2013-05-09 13:43:07 +0000
231+++ plugins/notification/src/notification.cpp 2019-02-05 20:40:50 +0000
232@@ -28,13 +28,6 @@
233
234 const std::string IMAGE_DIR(".compiz/images");
235
236-/* libnotify 0.7 introduced proper NOTIFY_CHECK_VERSION macro */
237-#if defined(NOTIFY_CHECK_VERSION) && !defined(HAVE_LIBNOTIFY_0_6_1)
238-#if NOTIFY_CHECK_VERSION(0,6,1)
239-#define HAVE_LIBNOTIFY_0_6_1
240-#endif
241-#endif
242-
243 void
244 NotificationScreen::logMessage (const char *component,
245 CompLogLevel level,
246@@ -65,9 +58,6 @@
247
248 n = notify_notification_new (logLevel, message,
249 iconUri.c_str ()
250-#ifndef HAVE_LIBNOTIFY_0_6_1
251- , NULL
252-#endif
253 );
254
255 timeout = optionGetTimeout ();
256
257=== modified file 'tests/integration/glib/CMakeLists.txt'
258--- tests/integration/glib/CMakeLists.txt 2013-04-22 14:30:55 +0000
259+++ tests/integration/glib/CMakeLists.txt 2019-02-05 20:40:50 +0000
260@@ -1,5 +1,3 @@
261-include (FindPkgConfig)
262-
263 pkg_check_modules (COMPIZ_GLIB_INTEGRATION_TEST glibmm-2.4)
264
265 if (COMPIZ_GLIB_INTEGRATION_TEST_FOUND)
266
267=== modified file 'tests/system/untest/CMakeLists.txt'
268--- tests/system/untest/CMakeLists.txt 2018-07-24 10:32:11 +0000
269+++ tests/system/untest/CMakeLists.txt 2019-02-05 20:40:50 +0000
270@@ -1,6 +1,3 @@
271-cmake_minimum_required (VERSION 2.8.12)
272-
273-include (FindPkgConfig)
274 pkg_check_modules (COMPIZ_UNTEST REQUIRED gtk+-3.0 gl x11)
275
276 add_executable (untest untest.c)
277
278=== modified file 'tests/xorg-gtest/communicator/CMakeLists.txt'
279--- tests/xorg-gtest/communicator/CMakeLists.txt 2013-02-14 05:57:39 +0000
280+++ tests/xorg-gtest/communicator/CMakeLists.txt 2019-02-05 20:40:50 +0000
281@@ -1,5 +1,3 @@
282-include (FindPkgConfig)
283-
284 pkg_check_modules (COMPIZ_XORG_GTEST_COMMUNICATOR x11)
285
286 if (COMPIZ_XORG_GTEST_COMMUNICATOR_FOUND)

Subscribers

People subscribed via source and target branches