summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2009-03-15 06:09:18 +0100
committerDennis kasprzyk <onestone@compiz-fusion.org>2009-03-15 06:09:18 +0100
commit163f6b6f3c3b7764987cbdf8e03cc355edeaa499 (patch)
tree4278afde195343dcb8277b0bb0b6efc926ce8907 /gtk
parent28e45c55c11e20206d3bc9056aea8fc7f1b7a0e7 (diff)
downloadzcomp-163f6b6f3c3b7764987cbdf8e03cc355edeaa499.tar.gz
zcomp-163f6b6f3c3b7764987cbdf8e03cc355edeaa499.tar.bz2
New generalized build system.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/CMakeLists.txt26
-rw-r--r--gtk/window-decorator/CMakeLists.txt4
2 files changed, 9 insertions, 21 deletions
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index 1705a1b..a6f00b6 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -2,18 +2,6 @@ set (USE_GTK 1 CACHE BOOL "Build gtk-window-decorator")
set (USE_METACITY 1 CACHE BOOL "Gtk-window-decorator metacity theme support")
set (USE_GNOME 1 CACHE BOOL "Gnome settings module")
set (USE_GNOME_KEYBINDINGS 1 CACHE BOOL "Gnome keybindings")
-set (USE_GCONF 1 CACHE BOOL "Install GConf schemas")
-
-if (USE_GCONF)
- pkg_check_modules (GCONF gconf-2.0)
-
- find_program (GCONFTOOL_EXECUTABLE gconftool-2)
- mark_as_advanced (FORCE GCONFTOOL_EXECUTABLE)
-
- if (NOT GCONF_FOUND OR NOT GCONFTOOL_EXECUTABLE)
- set (USE_GCONF 0)
- endif (NOT GCONF_FOUND OR NOT GCONFTOOL_EXECUTABLE)
-endif (USE_GCONF)
if (USE_GTK)
pkg_check_modules (GTK_WINDOW_DECORATOR
@@ -29,22 +17,22 @@ if (USE_GTK)
set (CMAKE_REQUIRED_FLAGS "")
set (CMAKE_REQUIRED_LIBRARIES "")
- check_pkg_module (libwnck-1.0>=2.18.1 HAVE_LIBWNCK_2_18_1)
- check_pkg_module (libwnck-1.0>=2.19.4 HAVE_LIBWNCK_2_19_4)
+ compiz_pkg_check_modules (HAVE_LIBWNCK_2_18_1 libwnck-1.0>=2.18.1)
+ compiz_pkg_check_modules (HAVE_LIBWNCK_2_19_4 libwnck-1.0>=2.19.4)
if (USE_METACITY)
pkg_check_modules (METACITY libmetacity-private)
if (METACITY_FOUND)
- check_pkg_module (libmetacity-private>=2.15.21 HAVE_METACITY_2_15_21)
- check_pkg_module (libmetacity-private>=2.17.0 HAVE_METACITY_2_17_0)
- check_pkg_module (libmetacity-private>=2.23.2 HAVE_METACITY_2_23_2)
+ compiz_pkg_check_modules (HAVE_METACITY_2_15_21 libmetacity-private>=2.15.21)
+ compiz_pkg_check_modules (HAVE_METACITY_2_17_0 libmetacity-private>=2.17.0)
+ compiz_pkg_check_modules (HAVE_METACITY_2_23_2 libmetacity-private>=2.23.2)
else (METACITY_FOUND)
set (USE_METACITY 0)
endif (METACITY_FOUND)
endif (USE_METACITY)
if (USE_GNOME)
- pkg_check_modules (GNOME_WINDOW_SETTINGS
+ compiz_pkg_check_modules (GNOME_WINDOW_SETTINGS
gnome-window-settings-2.0
gnome-desktop-2.0
)
@@ -65,7 +53,7 @@ if (USE_GTK)
endif (USE_GNOME)
if (USE_GNOME_KEYBINDINGS)
- pkg_check_modules (GNOME_KEY_BINDINGS gnome-keybindings)
+ compiz_pkg_check_modules (GNOME_KEY_BINDINGS gnome-keybindings)
if (GNOME_KEY_BINDINGS_FOUND)
exec_program (${PKG_CONFIG_EXECUTABLE}
ARGS "--variable=keysdir gnome-keybindings"
diff --git a/gtk/window-decorator/CMakeLists.txt b/gtk/window-decorator/CMakeLists.txt
index a4c7e30..7ec4d54 100644
--- a/gtk/window-decorator/CMakeLists.txt
+++ b/gtk/window-decorator/CMakeLists.txt
@@ -23,11 +23,11 @@ if (USE_GTK)
if (USE_GCONF)
set (gwd_schema ${CMAKE_CURRENT_BINARY_DIR}/gwd.schemas)
- translate_xml (
+ compiz_translate_xml (
${CMAKE_CURRENT_SOURCE_DIR}/gwd.schemas.in
${gwd_schema}
)
- install_gconf_schema (${CMAKE_CURRENT_BINARY_DIR}/gwd.schemas)
+ compiz_install_gconf_schema (${CMAKE_CURRENT_BINARY_DIR}/gwd.schemas ${SCHEMADIR})
endif (USE_GCONF)
add_executable (gtk-window-decorator