From d975cad678f273e63d54236a2d3e710eeab86084 Mon Sep 17 00:00:00 2001
From: Jim Nelson <jim@yorba.org>
Date: Wed, 22 Aug 2012 11:49:16 -0700
Subject: [PATCH] Geary does not run in build directory

Prior commit fixed #5692 but broke running Geary from the build
directory (because the GSettings schema isn't installed).
---
 src/CMakeLists.txt        | 6 ++++++
 src/client/CMakeLists.txt | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2de67385..285d0ed5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -408,6 +408,12 @@ add_custom_command(
         ${CMAKE_COMMAND} -E copy geary ${CMAKE_BINARY_DIR}/
 )
 
+# GSettings
+# This needs to be here and not in client/CMakeLists.txt in order for Geary to run in the build
+# directory
+include(GSettings)
+add_schemas(geary ${GSETTINGS_DIR})
+
 add_subdirectory(client)
 
 # Console app
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 604e1581..6136713f 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -8,10 +8,6 @@ install(
         share/applications
 )
 
-# GSettings
-include(GSettings)
-add_schemas(geary ${GSETTINGS_DIR})
-
 # Optional: run update-desktop-database at install time.
 # (This has to happen after the geary.desktop file is installed.)
 if (DESKTOP_UPDATE)