[latexila] Create INSTALL.in



commit 9bd05cb279ba30b21163a1ad159d7351351d0f79
Author: SÃbastien Wilmet <swilmet src gnome org>
Date:   Tue Jul 24 22:53:02 2012 +0200

    Create INSTALL.in
    
    I've forgot several times to update the INSTALL file after changing the
    required version of a dependency. Now this problem is resolved!

 .gitignore            |    1 +
 CMakeLists.txt        |   28 ++++++++++++++++++++--------
 INSTALL => INSTALL.in |   12 ++++++------
 3 files changed, 27 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e845566..9737d93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+INSTALL
 README
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f52d52f..83e90cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,12 @@
-cmake_minimum_required (VERSION 2.6.4)
+# Required versions
+set (CMAKE_REQUIRED_VERSION		2.6.4)
+set (GLIB_REQUIRED_VERSION		2.32)
+set (GTK_REQUIRED_VERSION		3.4.3)
+set (GTKSOURCEVIEW_REQUIRED_VERSION	3.4.1)
+set (GTKSPELL_REQUIRED_VERSION		3.0)
+set (VALA_REQUIRED_VERSION		0.17.3.1)
+
+cmake_minimum_required (VERSION ${CMAKE_REQUIRED_VERSION})
 
 set (APP_NAME "LaTeXila")
 set (APP_VERSION "2.5.2")
@@ -39,7 +47,6 @@ find_package (Itstool REQUIRED)
 # Vala
 if (BUILD_VALA)
 	set (_vala_main_version "0.18")
-	set (_vala_min_version "0.17.3.1")
 
 	if (VALAC)
 		message (STATUS "Use custom valac: ${VALAC}")
@@ -48,19 +55,19 @@ if (BUILD_VALA)
 		find_vala (${_vala_main_version})
 
 		if ((NOT VALA_FOUND) OR
-		    ("${VALA_VERSION}" VERSION_LESS "${_vala_min_version}"))
+		    ("${VALA_VERSION}" VERSION_LESS "${VALA_REQUIRED_VERSION}"))
 			message (FATAL_ERROR
-				"valac-${_vala_main_version} >= ${_vala_min_version} required")
+				"valac-${_vala_main_version} >= ${VALA_REQUIRED_VERSION} required")
 		endif ()
 	endif ()
 endif ()
 
 # Dependencies
 find_package (PkgConfig)
-pkg_check_modules (GTK REQUIRED "gtk+-3.0 >= 3.4.3")
-pkg_check_modules (GTKSOURCEVIEW REQUIRED "gtksourceview-3.0 >= 3.4.1")
+pkg_check_modules (GTK REQUIRED "gtk+-3.0 >= ${GTK_REQUIRED_VERSION}")
+pkg_check_modules (GTKSOURCEVIEW REQUIRED "gtksourceview-3.0 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}")
 pkg_check_modules (GEE REQUIRED "gee-1.0")
-pkg_check_modules (GIO REQUIRED "gio-2.0 >= 2.32")
+pkg_check_modules (GIO REQUIRED "gio-2.0 >= ${GLIB_REQUIRED_VERSION}")
 pkg_check_modules (GTKSPELL REQUIRED "gtkspell-3.0")
 
 add_definitions (
@@ -103,12 +110,17 @@ configure_file (
 
 add_definitions (-include config.h)
 
-# Generate README
+# Generate README and INSTALL
 configure_file (
 	${latexila_SOURCE_DIR}/README.in
 	${latexila_SOURCE_DIR}/README
 )
 
+configure_file (
+	${latexila_SOURCE_DIR}/INSTALL.in
+	${latexila_SOURCE_DIR}/INSTALL
+)
+
 # Resources
 find_package (gresources REQUIRED)
 
diff --git a/INSTALL b/INSTALL.in
similarity index 90%
rename from INSTALL
rename to INSTALL.in
index 4968041..8420dae 100644
--- a/INSTALL
+++ b/INSTALL.in
@@ -1,17 +1,17 @@
 Requirements
 ============
 
-GLib >= 2.32
-GTK+ >= 3.4.3
-GtkSourceView >= 3.4.1
-GtkSpell >= 3.0 (not yet released, see note below)
+GLib >= @GLIB_REQUIRED_VERSION@
+GTK+ >= @GTK_REQUIRED_VERSION@
+GtkSourceView >= @GTKSOURCEVIEW_REQUIRED_VERSION@
+GtkSpell >= @GTKSPELL_REQUIRED_VERSION@ (not yet released, see note below)
 libgee
 gettext
 gsettings-desktop-schemas (optional)
 
 And for building the sources:
-CMake >= 2.6.4
-Vala >= 0.17.1 (may be optional)
+CMake >= @CMAKE_REQUIRED_VERSION@
+Vala >= @VALA_REQUIRED_VERSION@ (may be optional)
 ITS Tool
 
 If you are installing LaTeXila from a tarball, you don't have to install Vala



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]