From ff12cf45b410c70bd6ad0a6eb123ba599c39dadb Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Tue, 19 Dec 2017 08:13:07 +0000 Subject: [PATCH] Merge r224725 - [GTK] PlatformGTK.cmake: use the PKG_CONFIG_EXECUTABLE variable https://bugs.webkit.org/show_bug.cgi?id=179547 Patch by Helmut Grohne on 2017-11-11 Reviewed by Michael Catanzaro. * PlatformGTK.cmake: Use PKG_CONFIG_EXECUTABLE instead of hardcoding the executable name. --- Source/WebCore/ChangeLog | 10 ++++++++++ Source/WebCore/PlatformGTK.cmake | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 20967dcd688f..811796ae261f 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2017-11-11 Helmut Grohne + + [GTK] PlatformGTK.cmake: use the PKG_CONFIG_EXECUTABLE variable + https://bugs.webkit.org/show_bug.cgi?id=179547 + + Reviewed by Michael Catanzaro. + + * PlatformGTK.cmake: Use PKG_CONFIG_EXECUTABLE instead of + hardcoding the executable name. + 2017-12-04 Carlos Garcia Campos [GStreamer] More leaks in TextCombinerGStreamer diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake index 6dd96ac228b3..c95a24e2d6bd 100644 --- a/Source/WebCore/PlatformGTK.cmake +++ b/Source/WebCore/PlatformGTK.cmake @@ -188,7 +188,7 @@ if (USE_GEOCLUE2) list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c ) - execute_process(COMMAND pkg-config --variable dbus_interface geoclue-2.0 OUTPUT_VARIABLE GEOCLUE_DBUS_INTERFACE) + execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable dbus_interface geoclue-2.0 OUTPUT_VARIABLE GEOCLUE_DBUS_INTERFACE) add_custom_command( OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.h COMMAND gdbus-codegen --interface-prefix org.freedesktop.GeoClue2. --c-namespace Geoclue --generate-c-code ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface ${GEOCLUE_DBUS_INTERFACE}