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

[Alberts Muktupāvels]

Don't set CMP0005 policy to OLD.

[Dmitry Shachnev (mitya57)]

review: Approve

=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2018-07-24 09:39:24 +0000
+++ cmake/CompizCommon.cmake	2018-07-24 09:39:24 +0000
@@ -13,7 +13,6 @@
 #### policies
 
 cmake_policy (SET CMP0002 OLD)
-cmake_policy (SET CMP0005 OLD)
 cmake_policy (SET CMP0011 OLD)
 cmake_policy (SET CMP0022 OLD)
 

=== modified file 'cmake/plugin_extensions/CompizGenInstallData.cmake'
--- cmake/plugin_extensions/CompizGenInstallData.cmake	2013-02-20 13:55:12 +0000
+++ cmake/plugin_extensions/CompizGenInstallData.cmake	2018-07-24 09:39:24 +0000
@@ -23,5 +23,5 @@
 	    DESTINATION ${PLUGIN_DATADIR}
 	)
     endif (_install_plugin_${COMPIZ_CURRENT_PLUGIN})
-    list (APPEND COMPIZ_DEFINITIONS_ADD "-DDATADIR='\"${PLUGIN_DATADIR}\"'")
+    list (APPEND COMPIZ_DEFINITIONS_ADD -DDATADIR="${PLUGIN_DATADIR}")
 endif ()

=== modified file 'compizconfig/libcompizconfig/src/CMakeLists.txt'
--- compizconfig/libcompizconfig/src/CMakeLists.txt	2013-02-21 05:21:26 +0000
+++ compizconfig/libcompizconfig/src/CMakeLists.txt	2018-07-24 09:39:24 +0000
@@ -24,12 +24,12 @@
 
 add_definitions (
     -DHAVE_CONFIG_H
-    -DPLUGINDIR=\\\"${COMPIZ_PLUGINDIR}\\\"
-    -DIMAGEDIR=\\\"${COMPIZ_IMAGEDIR}\\\"
-    -DMETADATADIR=\\\"${COMPIZ_METADATADIR}\\\"
-    -DSYSCONFDIR=\\\"${COMPIZ_SYSCONFDIR}\\\"
-    -DDATADIR=\\\"${COMPIZ_DATADIR}\\\"
-    -DLIBDIR=\\\"${COMPIZ_LIBDIR}\\\"
+    -DPLUGINDIR="${COMPIZ_PLUGINDIR}"
+    -DIMAGEDIR="${COMPIZ_IMAGEDIR}"
+    -DMETADATADIR="${COMPIZ_METADATADIR}"
+    -DSYSCONFDIR="${COMPIZ_SYSCONFDIR}"
+    -DDATADIR="${COMPIZ_DATADIR}"
+    -DLIBDIR="${COMPIZ_LIBDIR}"
 )
 
 if (HAVE_PROTOBUF)

=== modified file 'compizconfig/libcompizconfig/tests/CMakeLists.txt'
--- compizconfig/libcompizconfig/tests/CMakeLists.txt	2015-07-30 19:56:19 +0000
+++ compizconfig/libcompizconfig/tests/CMakeLists.txt	2018-07-24 09:39:24 +0000
@@ -11,7 +11,7 @@
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
-add_definitions (-DSYSCONFDIR=\\\"${COMPIZ_SYSCONFDIR}\\\")
+add_definitions (-DSYSCONFDIR="${COMPIZ_SYSCONFDIR}")
 
 add_executable (compizconfig_test_ccs_object
 		${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_object.cpp)

=== modified file 'gtk/window-decorator/CMakeLists.txt'
--- gtk/window-decorator/CMakeLists.txt	2016-06-08 10:34:32 +0000
+++ gtk/window-decorator/CMakeLists.txt	2018-07-24 09:39:24 +0000
@@ -13,10 +13,11 @@
 	${DBUS_GLIB_INCLUDE_DIRS}
     )
 
+    string(REPLACE ";" " " LINGUAS "${ALL_LINGUAS}")
     add_definitions (
 	-DHAVE_CONFIG_H
-	-DALL_LINGUAS=\"${ALL_LINGUAS}\"
-	-DLOCALEDIR=\\\"${datadir}/locale\\\"
+	-DALL_LINGUAS=${LINGUAS}
+	-DLOCALEDIR="${datadir}/locale"
     )
 
     link_directories (

=== modified file 'plugins/dbus/CMakeLists.txt'
--- plugins/dbus/CMakeLists.txt	2010-04-23 17:16:17 +0000
+++ plugins/dbus/CMakeLists.txt	2018-07-24 09:39:24 +0000
@@ -4,8 +4,8 @@
 
 add_definitions (
     -DHAVE_CONFIG_H
-    -DPLUGINDIR=\\\"${compiz_plugindir}\\\"
-    -DMETADATADIR=\\\"${compiz_metadatadir}\\\"
+    -DPLUGINDIR="${compiz_plugindir}"
+    -DMETADATADIR="${compiz_metadatadir}"
 )
 
 compiz_plugin (dbus PKGDEPS dbus-1 libxml-2.0)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-01-03 16:05:26 +0000
+++ src/CMakeLists.txt	2018-07-24 09:39:24 +0000
@@ -82,9 +82,9 @@
 
 add_definitions (
     -DHAVE_CONFIG_H
-    -DPLUGINDIR=\\\"${compiz_plugindir}\\\"
-    -DSHAREDIR=\\\"${compiz_sharedir}\\\"
-    -DMETADATADIR=\\\"${compiz_metadatadir}\\\"
+    -DPLUGINDIR="${compiz_plugindir}"
+    -DSHAREDIR="${compiz_sharedir}"
+    -DMETADATADIR="${compiz_metadatadir}"
 )
 
 get_property (CORE_MOD_LIBRARY_DIRS

=== modified file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt	2012-09-29 15:35:59 +0000
+++ src/plugin/CMakeLists.txt	2018-07-24 09:39:24 +0000
@@ -26,9 +26,9 @@
 
 add_definitions (
     -DHAVE_CONFIG_H
-    -DPLUGINDIR=\\\"${compiz_plugindir}\\\"
-    -DSHAREDIR=\\\"${compiz_sharedir}\\\"
-    -DMETADATADIR=\\\"${compiz_metadatadir}\\\"
+    -DPLUGINDIR="${compiz_plugindir}"
+    -DSHAREDIR="${compiz_sharedir}"
+    -DMETADATADIR="${compiz_metadatadir}"
 )
 
 SET( SRCS ${compiz_SOURCE_DIR}/src/plugin.cpp )

=== modified file 'src/plugin/tests/CMakeLists.txt'
--- src/plugin/tests/CMakeLists.txt	2013-04-22 14:30:55 +0000
+++ src/plugin/tests/CMakeLists.txt	2018-07-24 09:39:24 +0000
@@ -10,12 +10,11 @@
 
 add_definitions (
     -DHAVE_CONFIG_H
-    -DPLUGINDIR=\\\"${compiz_plugindir}\\\"
-    -DSHAREDIR=\\\"${compiz_sharedir}\\\"
-    -DMETADATADIR=\\\"${compiz_metadatadir}\\\"
+    -DPLUGINDIR="${compiz_plugindir}"
+    -DSHAREDIR="${compiz_sharedir}"
+    -DMETADATADIR="${compiz_metadatadir}"
 )
 
-
 add_executable( 
   compiz_plugin_test
   
@@ -33,4 +32,3 @@
 )
 
 compiz_discover_tests ( compiz_plugin_test COVERAGE compiz_plugin compiz_core )
-

=== modified file 'src/privatescreen/tests/CMakeLists.txt'
--- src/privatescreen/tests/CMakeLists.txt	2013-04-22 14:30:55 +0000
+++ src/privatescreen/tests/CMakeLists.txt	2018-07-24 09:39:24 +0000
@@ -26,15 +26,13 @@
   ${Boost_INCLUDE_DIRS}
 )
 
-
 add_definitions (
     -DHAVE_CONFIG_H
-    -DPLUGINDIR=\\\"${compiz_plugindir}\\\"
-    -DSHAREDIR=\\\"${compiz_sharedir}\\\"
-    -DMETADATADIR=\\\"${compiz_metadatadir}\\\"
+    -DPLUGINDIR="${compiz_plugindir}"
+    -DSHAREDIR="${compiz_sharedir}"
+    -DMETADATADIR="${compiz_metadatadir}"
 )
 
-
 add_executable( 
   compiz_privatescreen_test
   

=== modified file 'src/region/tests/CMakeLists.txt'
--- src/region/tests/CMakeLists.txt	2013-04-22 14:30:55 +0000
+++ src/region/tests/CMakeLists.txt	2018-07-24 09:39:24 +0000
@@ -9,12 +9,11 @@
 
 add_definitions (
     -DHAVE_CONFIG_H
-    -DPLUGINDIR=\\\"${compiz_plugindir}\\\"
-    -DSHAREDIR=\\\"${compiz_sharedir}\\\"
-    -DMETADATADIR=\\\"${compiz_metadatadir}\\\"
+    -DPLUGINDIR="${compiz_plugindir}"
+    -DSHAREDIR="${compiz_sharedir}"
+    -DMETADATADIR="${compiz_metadatadir}"
 )
 
-
 add_executable( 
   compiz_region_test