| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 10cfdcc905915d8814c609008a069102f2bc7e39 Mon Sep 17 00:00:00 2001 |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 27 Oct 2015 16:02:19 +0200 |
| 4 | Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained |
| 5 | from pkg-config with PKG_CONFIG_SYSROOT_DIR |
| 6 | |
| Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 7 | See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for |
| 8 | reasons why this is not approproiate for upstream submission. |
| 9 | |
| 10 | Upstream-Status: Inappropriate [oe-core specific] |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 12 | --- |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 13 | Source/cmake/FindGI.cmake | 3 +++ |
| 14 | 1 file changed, 3 insertions(+) |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 15 | |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 16 | diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake |
| 17 | index af039cbb..b3e810cd 100644 |
| 18 | --- a/Source/cmake/FindGI.cmake |
| 19 | +++ b/Source/cmake/FindGI.cmake |
| 20 | @@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND) |
| 21 | endif () |
| 22 | endif () |
| Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 23 | |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 24 | +set(_GI_SCANNER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_SCANNER_EXE}") |
| 25 | +set(_GI_COMPILER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_COMPILER_EXE}") |
| 26 | + |
| 27 | find_program(GI_SCANNER_EXE NAMES ${_GI_SCANNER_EXE} g-ir-scanner) |
| 28 | find_program(GI_COMPILER_EXE NAMES ${_GI_COMPILER_EXE} g-ir-compiler) |
| Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 29 | |