Merge r224725 - [GTK] PlatformGTK.cmake: use the PKG_CONFIG_EXECUTABL…

…E variable https://bugs.webkit.org/show_bug.cgi?id=179547 Patch by Helmut Grohne <helmut@subdivi.de> on 2017-11-11 Reviewed by Michael Catanzaro. * PlatformGTK.cmake: Use PKG_CONFIG_EXECUTABLE instead of hardcoding the executable name.
WebKit · Dec 19, 2017 · ff12cf4 · ff12cf4
1 parent 6fb6902
commit ff12cf4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2017-11-11  Helmut Grohne  <helmut@subdivi.de>
+
+        [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  <cgarcia@igalia.com>
 
         [GStreamer] More leaks in TextCombinerGStreamer

diff --git 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}