nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use PKG_CONFIG_EXECUTABLE provided by find_package(PkgConfig)

Browse source 
find_package(PkgConfig} respects the PKG_CONFIG environment variable
when trying to find pkg-config. This is helpful with a differently
named pkg-config executable, for example an arch-prefixed one.
This commit is contained in:
Heiko Becker 2015-10-06 19:50:21 +02:00 • committed by Michael James Gratton
parent 5045ff0443
commit 7166c15ea3
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake/GSettings.cmake
View file

@ -18,7 +18,7 @@ if (GSETTINGS_COMPILE_IN_PLACE)
endif () endif ()
macro(add_schemas GSETTINGS_TARGET SCHEMA_DIRECTORY PREFIX) macro(add_schemas GSETTINGS_TARGET SCHEMA_DIRECTORY PREFIX)
set(PKG_CONFIG_EXECUTABLE pkg-config) find_package(PkgConfig)
# Locate all schema files. # Locate all schema files.
file(GLOB all_schema_files file(GLOB all_schema_files

2
src/CMakeLists.txt
View file

@ -602,7 +602,7 @@ add_custom_command(
WORKING_DIRECTORY WORKING_DIRECTORY
${CMAKE_SOURCE_DIR}/bindings/metadata ${CMAKE_SOURCE_DIR}/bindings/metadata
COMMAND COMMAND
vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
) )
# Geary client app # Geary client app