summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorTravis Watkins <travis.watkins@linaro.org>2011-08-30 08:33:54 -0500
committerTravis Watkins <travis.watkins@linaro.org>2011-08-30 08:33:54 -0500
commit43c84a48550f71455582915c4881241a5e360ec2 (patch)
tree7c0c9cc0c281973694e61118d17840050c5a48b5 /cmake
parent9fd0b94c600a451726e4b2124516afe3d32f13bc (diff)
parent5fbc293d6c63eb3e74f00ffa791b4f4abd3e10c2 (diff)
downloadmobileperf-43c84a48550f71455582915c4881241a5e360ec2.tar.gz
mobileperf-43c84a48550f71455582915c4881241a5e360ec2.tar.bz2
Merge branch 'master' into gles
Conflicts: src/plugin.cpp
Diffstat (limited to 'cmake')
-rw-r--r--cmake/CompizGSettings.cmake15
-rw-r--r--cmake/plugin_extensions/CompizGenGSettings.cmake13
2 files changed, 23 insertions, 5 deletions
diff --git a/cmake/CompizGSettings.cmake b/cmake/CompizGSettings.cmake
index 5af71e3..192764d 100644
--- a/cmake/CompizGSettings.cmake
+++ b/cmake/CompizGSettings.cmake
@@ -1,6 +1,12 @@
option (
+ USE_GSETTINGS
+ "Generate GSettings schemas"
+ ON
+)
+
+option (
COMPIZ_DISABLE_GS_SCHEMAS_INSTALL
- "Disables gsettings schema installation with gconftool"
+ "Disables gsettings schema installation"
OFF
)
@@ -18,7 +24,10 @@ function (compiz_install_gsettings_schema _src _dst)
execute_process (COMMAND ${PKG_CONFIG_TOOL} glib-2.0 --variable prefix OUTPUT_VARIABLE GSETTINGS_GLIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
SET (GSETTINGS_GLOBAL_INSTALL_DIR "${GSETTINGS_GLIB_PREFIX}/share/glib-2.0/schemas/")
- if (PKG_CONFIG_TOOL AND GLIB_COMPILE_SCHEMAS AND NOT COMPIZ_DISABLE_SCHEMAS_INSTALL)
+ if (PKG_CONFIG_TOOL AND
+ GLIB_COMPILE_SCHEMAS AND NOT
+ COMPIZ_DISABLE_SCHEMAS_INSTALL AND
+ USE_GSETTINGS)
install (CODE "
message (\"$ENV{USER} is the username in use right now\")
if (\"$ENV{USER}\"\ STREQUAL \"root\")
@@ -52,7 +61,7 @@ function (compiz_gsettings_schema _src _dst _inst)
find_program (XSLTPROC_EXECUTABLE xsltproc)
mark_as_advanced (FORCE XSLTPROC_EXECUTABLE)
- if (XSLTPROC_EXECUTABLE)
+ if (XSLTPROC_EXECUTABLE AND USE_GSETTINGS)
message ("generating gsettings schema for core")
add_custom_command (
OUTPUT ${_dst}
diff --git a/cmake/plugin_extensions/CompizGenGSettings.cmake b/cmake/plugin_extensions/CompizGenGSettings.cmake
index 49e6807..b182d13 100644
--- a/cmake/plugin_extensions/CompizGenGSettings.cmake
+++ b/cmake/plugin_extensions/CompizGenGSettings.cmake
@@ -4,6 +4,12 @@ option (
OFF
)
+option (
+ USE_GSETTINGS
+ "Generate GSettings schemas"
+ ON
+)
+
set (
COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR ${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR} CACHE PATH
"Installation path of the gsettings schema file"
@@ -47,7 +53,10 @@ function (compiz_install_gsettings_schema _src _dst)
execute_process (COMMAND ${PKG_CONFIG_TOOL} glib-2.0 --variable prefix OUTPUT_VARIABLE GSETTINGS_GLIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
SET (GSETTINGS_GLOBAL_INSTALL_DIR "${GSETTINGS_GLIB_PREFIX}/share/glib-2.0/schemas/")
- if (PKG_CONFIG_TOOL AND GLIB_COMPILE_SCHEMAS AND NOT COMPIZ_DISABLE_SCHEMAS_INSTALL)
+ if (USE_GSETTINGS AND
+ PKG_CONFIG_TOOL AND
+ GLIB_COMPILE_SCHEMAS AND NOT
+ COMPIZ_DISABLE_SCHEMAS_INSTALL)
install (CODE "
if (\"$ENV{USER}\"\ STREQUAL \"root\")
message (\"-- Installing GSettings schemas ${GSETTINGS_GLOBAL_INSTALL_DIR}\"\)
@@ -79,7 +88,7 @@ endfunction ()
find_program (XSLTPROC_EXECUTABLE xsltproc)
mark_as_advanced (FORCE XSLTPROC_EXECUTABLE)
-if (XSLTPROC_EXECUTABLE)
+if (XSLTPROC_EXECUTABLE AND USE_GSETTINGS)
compiz_gsettings_prepare_install_dirs ()
add_custom_command (