1*4882a593SmuzhiyunFrom e0bf97eecfa601e08b9578f00b1000890284241a Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Alexander Kanavin <alex.kanavin@gmail.com>
3*4882a593SmuzhiyunDate: Tue, 27 Oct 2015 16:02:19 +0200
4*4882a593SmuzhiyunSubject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
5*4882a593Smuzhiyun from pkg-config with PKG_CONFIG_SYSROOT_DIR
6*4882a593Smuzhiyun
7*4882a593SmuzhiyunSee discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for
8*4882a593Smuzhiyunreasons why this is not approproiate for upstream submission.
9*4882a593Smuzhiyun
10*4882a593SmuzhiyunUpstream-Status: Inappropriate [oe-core specific]
11*4882a593SmuzhiyunSigned-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12*4882a593Smuzhiyun
13*4882a593Smuzhiyun---
14*4882a593Smuzhiyun Source/cmake/FindGObjectIntrospection.cmake | 4 +++-
15*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 1 deletion(-)
16*4882a593Smuzhiyun
17*4882a593Smuzhiyundiff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake
18*4882a593Smuzhiyunindex be96814a..ae67b593 100644
19*4882a593Smuzhiyun--- a/Source/cmake/FindGObjectIntrospection.cmake
20*4882a593Smuzhiyun+++ b/Source/cmake/FindGObjectIntrospection.cmake
21*4882a593Smuzhiyun@@ -16,7 +16,6 @@
22*4882a593Smuzhiyun # Redistribution and use is allowed according to the terms of the BSD license.
23*4882a593Smuzhiyun
24*4882a593Smuzhiyun
25*4882a593Smuzhiyun-
26*4882a593Smuzhiyun find_package(PkgConfig QUIET)
27*4882a593Smuzhiyun if (PKG_CONFIG_FOUND)
28*4882a593Smuzhiyun     if (PACKAGE_FIND_VERSION_COUNT GREATER 0)
29*4882a593Smuzhiyun@@ -30,6 +29,9 @@ if (PKG_CONFIG_FOUND)
30*4882a593Smuzhiyun         pkg_get_variable(INTROSPECTION_GENERATE gobject-introspection-1.0 g_ir_generate)
31*4882a593Smuzhiyun         pkg_get_variable(INTROSPECTION_GIRDIR gobject-introspection-1.0 girdir)
32*4882a593Smuzhiyun         pkg_get_variable(INTROSPECTION_TYPELIBDIR gobject-introspection-1.0 typelibdir)
33*4882a593Smuzhiyun+        set(INTROSPECTION_SCANNER "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_SCANNER}")
34*4882a593Smuzhiyun+        set(INTROSPECTION_COMPILER "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_COMPILER}")
35*4882a593Smuzhiyun+        set(INTROSPECTION_GENERATE "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_GENERATE}")
36*4882a593Smuzhiyun         set(INTROSPECTION_VERSION "${_pc_gir_VERSION}")
37*4882a593Smuzhiyun         if (${INTROSPECTION_VERSION} VERSION_GREATER_EQUAL "1.59.1")
38*4882a593Smuzhiyun             set(INTROSPECTION_HAVE_SOURCES_TOP_DIRS YES)
39