[poppler] glib/CMakeLists.txt

[GitLab Mirror]

 glib/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9d5731ba254f35e2d94b628c51e48c50a945271
Author: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Date:   Mon Jan 24 09:28:20 2022 +0100

    glib/CMakeLists.txt: allow the user to configure INTROSPECTION_COMPILER_ARGS
    
    Allow the user to add its own parameters such as
    --includedir=$(STAGING_DIR)/usr/share/gir-1.0 to
    INTROSPECTION_COMPILER_ARGS to avoid the following build failure when
    cross-compiling with buildroot:
    
    [ 98%] Generating Poppler-0.18.typelib
    Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir
    error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0
    If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help.
    Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs"
    
    Fixes:
     - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e
    
    Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 7510e69e..f5130e3c 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -119,7 +119,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
   # General gir: Reset object-list for introspection & load tool args
   set(INTROSPECTION_GIRS)
   set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all")
-  set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
+  set(INTROSPECTION_COMPILER_ARGS ${INTROSPECTION_COMPILER_ARGS} "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
 
   # Poppler: Assign package to gir & export keys
   set(Poppler_0_18_gir "poppler-glib")