[latexila] CMake option: WITH_GNOME, for gsettings-desktop-schemas
- From: SÃbastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [latexila] CMake option: WITH_GNOME, for gsettings-desktop-schemas
- Date: Sat, 13 Aug 2011 18:11:07 +0000 (UTC)
commit ff6acdfe9d43a2ec9744740fdf86a91434bc6a06
Author: SÃbastien Wilmet <swilmet src gnome org>
Date: Sat Aug 13 19:51:39 2011 +0200
CMake option: WITH_GNOME, for gsettings-desktop-schemas
Before, the dependency to gsettings-desktop-schemas was not explicit.
During the cmake command, if g-d-s was already installed, then we used
it, if not, we didn't depend on it.
But if the user uninstall g-d-s afterwards, latexila is broken.
Now, the dependency is explicit. And by default, it is disabled. If you
want to enable it, run cmake with:
-DWITH_GNOME=ON
CMakeLists.txt | 7 ++++---
INSTALL | 11 +++++++++--
2 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a24e60c..fc13c6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,8 @@ message (STATUS "*** Building ${APP_NAME} ${APP_VERSION} ***")
set (DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/latexila"
CACHE PATH "The directory where the data is")
set (BUILD_VALA ON CACHE BOOL "Generate the C code from Vala files")
+set (WITH_GNOME OFF CACHE BOOL
+ "Use gsettings-desktop-schemas for a better integration with GNOME")
# Native Language Support
set (GETTEXT_PACKAGE "latexila")
@@ -35,10 +37,9 @@ pkg_check_modules (GIO REQUIRED "gio-2.0 >= 2.26")
pkg_check_modules (UNIQUE REQUIRED "unique-1.0")
pkg_check_modules (GDK-X11 REQUIRED "gdk-x11-2.0")
pkg_check_modules (X11 REQUIRED "x11")
-pkg_check_modules (DESKTOP-SCHEMAS "gsettings-desktop-schemas")
-# is there an easier way?
-if (DESKTOP-SCHEMAS_FOUND)
+if (WITH_GNOME)
+ pkg_check_modules (DESKTOP-SCHEMAS REQUIRED "gsettings-desktop-schemas")
set (DESKTOP_SCHEMAS "1")
else ()
set (DESKTOP_SCHEMAS "0")
diff --git a/INSTALL b/INSTALL
index 96fd824..07d5bca 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,6 +12,7 @@ CMake >= 2.6.4
gettext
ITS Tool (http://itstool.org/)
gsettings-desktop-schemas (optional)
+Vala >= 0.12.1 (may be optional)
If you are installing LaTeXila from a tarball or from a 'releases-*' branch,
you don't have to install Vala because the C code is already generated.
@@ -42,10 +43,16 @@ Configuration
=============
* Change the install directory (by default /usr/local/)
- run cmake with this option:
+ Run cmake with this option:
-DCMAKE_INSTALL_PREFIX=/path/to/install/directory/
* Generate the C code from the Vala files
- run cmake with this option:
+ Run cmake with this option:
-DBUILD_VALA=ON
+* Better integration with GNOME, depends on gsettings-desktop-schemas
+ Run cmake with this option:
+ -DWITH_GNOME=ON
+
+ The only use of this is for knowing the system fixed width font (most
+ probably "Monospace 10").
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]