From bec883fef498206f05b20bc0a4ba241637657dba Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Sat, 5 Jun 2021 00:49:02 +0100 Subject: [PATCH] [doc] document vcpkg_fixup_pkgconfig merging behaviour (#18091) * [doc] document vcpkg_fixup_pkgconfig merging behaviour * [doc] add source --- docs/maintainers/vcpkg_fixup_pkgconfig.md | 6 +++++- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/maintainers/vcpkg_fixup_pkgconfig.md b/docs/maintainers/vcpkg_fixup_pkgconfig.md index dbfa2d4239..e94453d729 100644 --- a/docs/maintainers/vcpkg_fixup_pkgconfig.md +++ b/docs/maintainers/vcpkg_fixup_pkgconfig.md @@ -2,7 +2,11 @@ The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_fixup_pkgconfig.md). -Fix common paths in *.pc files and make everything relative to $(prefix) +Fix common paths in *.pc files and make everything relative to $(prefix). +Additionally, on static triplets, private entries are merged with their non-private counterparts, +allowing pkg-config to be called without the ``--static`` flag. +Note that vcpkg is designed to never have to call pkg-config with the ``--static`` flag, +since a consumer cannot know if a dependent library has been built statically or not. ## Usage ```cmake diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index c6384f33a3..3f37099a71 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -1,7 +1,11 @@ #[===[.md: # vcpkg_fixup_pkgconfig -Fix common paths in *.pc files and make everything relative to $(prefix) +Fix common paths in *.pc files and make everything relative to $(prefix). +Additionally, on static triplets, private entries are merged with their non-private counterparts, +allowing pkg-config to be called without the ``--static`` flag. +Note that vcpkg is designed to never have to call pkg-config with the ``--static`` flag, +since a consumer cannot know if a dependent library has been built statically or not. ## Usage ```cmake