diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c58c24aa..7a3f0b25 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -248,6 +248,7 @@ set(GSETTINGS_DIR ${CMAKE_SOURCE_DIR}/src/client) set(CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER} + -D_VERSION=\"${VERSION}\" -D_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" -D_SOURCE_ROOT_DIR=\"${CMAKE_SOURCE_DIR}\" -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\" diff --git a/src/client/geary-application.vala b/src/client/geary-application.vala index 72f27a57..7095fa0d 100644 --- a/src/client/geary-application.vala +++ b/src/client/geary-application.vala @@ -5,6 +5,7 @@ */ // Defined by CMake build script. +extern const string _VERSION; extern const string _INSTALL_PREFIX; extern const string _GSETTINGS_DIR; extern const string _SOURCE_ROOT_DIR; @@ -14,12 +15,12 @@ public class GearyApplication : YorbaApplication { public const string NAME = "Geary"; public const string PRGNAME = "geary"; public static string DESCRIPTION = _("Email Client"); - public const string VERSION = "0.0.0+trunk"; public const string COPYRIGHT = "Copyright 2011-2012 Yorba Foundation"; public const string WEBSITE = "http://www.yorba.org"; public static string WEBSITE_LABEL = _("Visit the Yorba web site"); public const string BUGREPORT = "http://redmine.yorba.org/projects/geary/issues"; + public const string VERSION = _VERSION; public const string INSTALL_PREFIX = _INSTALL_PREFIX; public const string GSETTINGS_DIR = _GSETTINGS_DIR; public const string SOURCE_ROOT_DIR = _SOURCE_ROOT_DIR;