[evolution-data-server/tintou/gdata] M!57 - libedataserver: Add explicit GData dependency for the introspection when enabled




commit 45009e9224bcf0ce8c88608e0858a5b3fdcb9a50
Author: Corentin Noël <corentin noel collabora com>
Date:   Wed Nov 25 10:23:54 2020 +0100

    M!57 - libedataserver: Add explicit GData dependency for the introspection when enabled
    
    When the libgdata support is enabled, EDataServer has a public dependency on libgdata
    via E.GDataOAuth2Authorizer.
    
    Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/57

 CMakeLists.txt                    | 2 ++
 src/libedataserver/CMakeLists.txt | 2 +-
 src/vala/CMakeLists.txt           | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f992aeadb..4fa483a4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -819,6 +819,8 @@ add_printable_option(ENABLE_GOOGLE "Enable Google support" ON)
 if(ENABLE_GOOGLE)
        pkg_check_modules_for_option(ENABLE_GOOGLE "Google" LIBGDATA libgdata>=${libgdata_minimum_version})
        set(HAVE_LIBGDATA ON)
+       set(LIBGDATA_GIR GData-0.0)
+       set(LIBGDATA_VAPI libgdata)
 
        set(CMAKE_REQUIRED_DEFINITIONS ${LIBGDATA_CFLAGS_OTHER})
        set(CMAKE_REQUIRED_INCLUDES ${LIBGDATA_INCLUDE_DIRS})
diff --git a/src/libedataserver/CMakeLists.txt b/src/libedataserver/CMakeLists.txt
index fa86153d9..3ade4cd0f 100644
--- a/src/libedataserver/CMakeLists.txt
+++ b/src/libedataserver/CMakeLists.txt
@@ -294,7 +294,7 @@ install(FILES ${HEADERS}
 
 set(gir_sources ${SOURCES} ${HEADERS})
 set(gir_identifies_prefixes E)
-set(gir_includes GObject-2.0 Gio-2.0 Soup-2.4 libxml2-2.0)
+set(gir_includes GObject-2.0 Gio-2.0 Soup-2.4 libxml2-2.0 ${LIBGDATA_GIR})
 set(gir_cflags
        -DLIBEDATASERVER_COMPILATION
 )
diff --git a/src/vala/CMakeLists.txt b/src/vala/CMakeLists.txt
index 4693fd0e2..caf940374 100644
--- a/src/vala/CMakeLists.txt
+++ b/src/vala/CMakeLists.txt
@@ -108,6 +108,7 @@ set(vala_deps
        libsoup-2.4
        libxml-2.0
        posix
+       ${LIBGDATA_VAPI}
 )
 
 set(extra_vapigen_files)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]