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

[Alberts Muktupāvels]

Don't set CMP0011 policy to OLD.

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

[Dmitry Shachnev (mitya57)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2018-07-24 10:25:21 +0000
+++ CMakeLists.txt	2018-07-24 10:25:21 +0000
@@ -3,7 +3,7 @@
 #
 project (compiz C CXX)
 
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.6.3)
 
 set (CMAKE_MODULE_PATH_ORIG ${CMAKE_MODULE_PATH})
 set (COMPIZ_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2018-07-24 10:25:21 +0000
+++ cmake/CompizCommon.cmake	2018-07-24 10:25:21 +0000
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.6.3)
 
 include (FindPkgConfig)
 
@@ -13,7 +13,6 @@
 #### policies
 
 cmake_policy (SET CMP0002 OLD)
-cmake_policy (SET CMP0011 OLD)
 cmake_policy (SET CMP0022 OLD)
 
 set (CMAKE_SKIP_RPATH FALSE)
 
=== modified file 'compizconfig/gsettings/CMakeLists.txt'
--- compizconfig/gsettings/CMakeLists.txt	2015-12-10 16:34:35 +0000
+++ compizconfig/gsettings/CMakeLists.txt	2018-07-24 10:25:21 +0000
@@ -46,10 +46,10 @@
 			DEPENDS ${_top_gschema_src}
 			VERBATIM)
 
-    add_custom_target (compiz_gsettings_schema
+    add_custom_target (compiz_config_gsettings_schema
 		       DEPENDS ${_top_gschema_dest})
 
-    add_gsettings_schema_to_recompilation_list (compiz_gsettings_schema)
+    add_gsettings_schema_to_recompilation_list (compiz_config_gsettings_schema)
 
     compiz_install_gsettings_schema (${_top_gschema_dest}
 				     ${_top_gschema_inst})
 
=== modified file 'tests/system/untest/CMakeLists.txt'
--- tests/system/untest/CMakeLists.txt	2012-11-14 10:17:09 +0000
+++ tests/system/untest/CMakeLists.txt	2018-07-24 10:25:21 +0000
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.6.3)
 
 include (FindPkgConfig)
 pkg_check_modules (COMPIZ_UNTEST REQUIRED gtk+-3.0 gl x11)
 
=== modified file 'tests/xorg-gtest/CMakeLists.txt'
--- tests/xorg-gtest/CMakeLists.txt	2013-06-28 01:10:57 +0000
+++ tests/xorg-gtest/CMakeLists.txt	2018-07-24 10:25:21 +0000
@@ -54,8 +54,5 @@
 		       ${COMPIZ_XORG_GTEST_COMMUNICATOR_LIBRARY}
 		       ${X11_XI_LIBRARIES})
 
-add_executable (xorg_gtest_wrapper
-		${CMAKE_CURRENT_SOURCE_DIR}/src/xorg_gtest_wrapper.cpp)
-
 add_subdirectory (communicator)
 add_subdirectory (plugins)