[geary/bug/776421-make-client-unit-testable: 2/8] Make VAPI build source arg a common valac arg, rather than repeating it.

[Michael Gratton <mjog src gnome org>]

commit e0b1c7b5461f77c81bd967c7c1fd02e2d4f149c1
Author: Michael James Gratton <mike vee net>
Date:   Mon Dec 26 10:42:51 2016 +1030

    Make VAPI build source arg a common valac arg, rather than repeating it.

 src/CMakeLists.txt  |    4 +---
 test/CMakeLists.txt |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 56ef18e..50762a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -576,6 +576,7 @@ add_definitions(${CFLAGS})
 
 set(VALAC_OPTIONS
     --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
+    --vapidir=${CMAKE_BINARY_DIR}/src
     --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata
     --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata/${WEBKITGTK_METADATA_DIR}
     --target-glib=${TARGET_GLIB}
@@ -630,7 +631,6 @@ CUSTOM_VAPIS
     "${CMAKE_BINARY_DIR}/src/webkitgtk-3.0.vapi"
 OPTIONS
     ${VALAC_OPTIONS}
-    --vapidir=${CMAKE_BINARY_DIR}/src
     --gresources=${RESOURCES_XML}
 )
 
@@ -662,7 +662,6 @@ CUSTOM_VAPIS
     "${CMAKE_BINARY_DIR}/src/geary-static.vapi"
 OPTIONS
     ${VALAC_OPTIONS}
-    --vapidir=${CMAKE_BINARY_DIR}/src
 )
 
 add_executable(geary-console ${CONSOLE_VALA_C})
@@ -685,7 +684,6 @@ CUSTOM_VAPIS
     "${CMAKE_BINARY_DIR}/src/geary-static.vapi"
 OPTIONS
     ${VALAC_OPTIONS}
-    --vapidir=${CMAKE_BINARY_DIR}/src
 )
 
 add_executable(geary-mailer ${MAILER_VALA_C})
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 648aba5..2a82848 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -44,6 +44,7 @@ link_directories(${LIB_PATHS})
 add_definitions(${CFLAGS})
 
 set(VALAC_OPTIONS
+    --vapidir=${CMAKE_BINARY_DIR}/src
     --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
     --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata
     --target-glib=${TARGET_GLIB}
@@ -61,7 +62,6 @@ PACKAGES
     ${TEST_PACKAGES}
 OPTIONS
     ${VALAC_OPTIONS}
-    --vapidir=${CMAKE_BINARY_DIR}/src
 )
 
 add_executable(geary-test ${TEST_VALA_C})