>From 45156b0a4dc7bdb8892539b5947328d884216a0d Mon Sep 17 00:00:00 2001
From: Michael James Gratton <mike vee net>
Date: Tue, 10 Jan 2017 00:32:48 +1100
Subject: [PATCH] Fix non-parallel build after landing geary-client changes.
 Bug 776421.

* src/CMakeLists.txt: Make geary-client depend on the VAPI generation,
  not the final client binary. Make geary-client depend on resource_copy
  so valac can find the actual resource files.

* ui/CMakeLists.txt: Don't bother generating the GResources header file,
  it's not needed.
---
 src/CMakeLists.txt |  6 ++----
 ui/CMakeLists.txt  | 12 +-----------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ec1a49b..1b2c3b8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -635,8 +635,6 @@ add_custom_command(
 
 # Client library (static lib used for building client and unit tests)
 #################################################
-set_property(SOURCE ${RESOURCES_C} PROPERTY GENERATED TRUE)
-set_property(SOURCE ${RESOURCES_XML} PROPERTY GENERATED TRUE)
 
 vala_precompile(CLIENT_VALA_C geary-client
     ${CLIENT_SRC}
@@ -651,15 +649,16 @@ OPTIONS
 )
 
 add_library(geary-client STATIC ${CLIENT_VALA_C})
+add_dependencies(geary-client resource_copy webkitgtk-vapi)
 target_link_libraries(geary-client m ${DEPS_LIBRARIES} geary-engine)
 
 # Main client application binary
 #################################################
+set_property(SOURCE ${RESOURCES_C} PROPERTY GENERATED TRUE)
 
 vala_precompile(GEARY_VALA_C geary
     "client/application/main.vala"
 PACKAGES
-    webkitgtk-3.0
     ${ENGINE_PACKAGES}
     ${CLIENT_PACKAGES}
     geary-client
@@ -668,7 +667,6 @@ OPTIONS
 )
 
 add_executable(geary ${GEARY_VALA_C} ${RESOURCES_C})
-add_dependencies(geary webkitgtk-vapi)
 target_link_libraries(geary ${DEPS_LIBRARIES} geary-client)
 install(TARGETS geary RUNTIME DESTINATION bin)
 add_custom_command(
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 501ab7a..eb2d2c3 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -42,17 +42,7 @@ compile_gresources(
   RESOURCES ${RESOURCE_LIST}
 )
 
-compile_gresources(
-  RESOURCES_H
-  RESOURCES_XML
-  TYPE EMBED_H
-  SOURCE_DIR "${CMAKE_SOURCE_DIR}/ui"
-  PREFIX "/org/gnome/Geary"
-  RESOURCES ${RESOURCE_LIST}
-)
-
-add_custom_target(resource_h ALL DEPENDS ${RESOURCES_H})
-add_custom_target(resource_c ALL DEPENDS ${RESOURCES_C})
+add_custom_target(resource_c DEPENDS ${RESOURCES_C})
 
 # Work around valac wanting the resource files to be in the same
 # directory as the XML file.
-- 
2.9.3