[evolution-data-server/wip/mcrha/libical-glib] Extend Vala and Introspection to search in the installed prefix for .gir files

[Milan Crha <mcrha src gnome org>]

commit b718d9092427e5ab3b791c6961148bb8e1197c65
Author: Milan Crha <mcrha redhat com>
Date:   Wed Apr 3 15:00:08 2019 +0200

    Extend Vala and Introspection to search in the installed prefix for .gir files

 cmake/modules/GObjectIntrospection.cmake | 1 +
 src/vala/CMakeLists.txt                  | 7 +++++++
 2 files changed, 8 insertions(+)
---
diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake
index dc7033d94..5e00d26d1 100644
--- a/cmake/modules/GObjectIntrospection.cmake
+++ b/cmake/modules/GObjectIntrospection.cmake
@@ -155,6 +155,7 @@ macro(gir_add_introspection gir)
                                COMMAND ${G_IR_COMPILER}
                                        ${INTROSPECTION_COMPILER_ARGS}
                                        --includedir=${CMAKE_CURRENT_SOURCE_DIR}
+                                       --includedir=${SHARE_INSTALL_PREFIX}/gir-1.0
                                        ${CMAKE_CURRENT_BINARY_DIR}/${gir}
                                        -o ${CMAKE_CURRENT_BINARY_DIR}/${_typelib}
                                DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${gir}
diff --git a/src/vala/CMakeLists.txt b/src/vala/CMakeLists.txt
index 0f4b76543..b01adbf45 100644
--- a/src/vala/CMakeLists.txt
+++ b/src/vala/CMakeLists.txt
@@ -45,6 +45,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-${API_VERSION}.vapi
                --vapidir=${CMAKE_CURRENT_SOURCE_DIR}
                --vapidir=${CMAKE_CURRENT_BINARY_DIR}
                --girdir=${CMAKE_BINARY_DIR}/src/camel
+               --girdir=${SHARE_INSTALL_PREFIX}/gir-1.0
                --pkg gio-2.0
                --pkg libxml-2.0
                --pkg posix
@@ -71,6 +72,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libedataserver-${API_VERSI
                --vapidir=${CMAKE_CURRENT_BINARY_DIR}
                --girdir=${CMAKE_BINARY_DIR}/src/camel
                --girdir=${CMAKE_BINARY_DIR}/src/libedataserver
+               --girdir=${SHARE_INSTALL_PREFIX}/gir-1.0
                --pkg gio-2.0
                --pkg libxml-2.0
                --pkg libsoup-2.4
@@ -101,6 +103,7 @@ if(HAVE_GTK)
                        --girdir=${CMAKE_BINARY_DIR}/src/camel
                        --girdir=${CMAKE_BINARY_DIR}/src/libedataserver
                        --girdir=${CMAKE_BINARY_DIR}/src/calendar/libecal
+                       --girdir=${SHARE_INSTALL_PREFIX}/gir-1.0
                        --pkg libedataserver-${API_VERSION}
                        --pkg gio-2.0
                        --pkg gtk+-3.0
@@ -132,6 +135,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libebook-contacts-${API_VE
                --vapidir=${CMAKE_CURRENT_BINARY_DIR}
                --girdir=${CMAKE_BINARY_DIR}/src/camel
                --girdir=${CMAKE_BINARY_DIR}/src/libedataserver
+               --girdir=${SHARE_INSTALL_PREFIX}/gir-1.0
                --pkg libedataserver-${API_VERSION}
                --pkg gio-2.0
                --pkg libxml-2.0
@@ -164,6 +168,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libebook-${API_VERSION}.va
                --girdir=${CMAKE_BINARY_DIR}/src/camel
                --girdir=${CMAKE_BINARY_DIR}/src/libedataserver
                --girdir=${CMAKE_BINARY_DIR}/src/addressbook/libebook-contacts
+               --girdir=${SHARE_INSTALL_PREFIX}/gir-1.0
                --pkg libedataserver-${API_VERSION}
                --pkg libebook-contacts-${API_VERSION}
                --pkg gio-2.0
@@ -196,6 +201,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libecal-${CAL_API_VERSION}
                --girdir=${CMAKE_BINARY_DIR}/src/camel
                --girdir=${CMAKE_BINARY_DIR}/src/libedataserver
                --girdir=${CMAKE_BINARY_DIR}/src/calendar/libecal
+               --girdir=${SHARE_INSTALL_PREFIX}/gir-1.0
                --pkg libedataserver-${API_VERSION}
                --pkg gio-2.0
                --pkg libxml-2.0
@@ -229,6 +235,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libedata-cal-${CAL_API_VER
                --girdir=${CMAKE_BINARY_DIR}/src/libedataserver
                --girdir=${CMAKE_BINARY_DIR}/src/calendar/libecal
                --girdir=${CMAKE_BINARY_DIR}/src/calendar/libedata-cal
+               --girdir=${SHARE_INSTALL_PREFIX}/gir-1.0
                --pkg libedataserver-${API_VERSION}
                --pkg libebackend-${API_VERSION}
                --pkg libecal-${CAL_API_VERSION}