aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2021-09-24 21:11:38 +0200
committerGitHub <noreply@github.com>2021-09-24 12:11:38 -0700
commita4368eabea44fa350b8aad89a9974b0a17eeefcd (patch)
tree12a2473fe947d1230a9d1aa8346c2fa10d7f62b2 /docs
parent845a5fda11742e02f6884125cd639d76f64be95e (diff)
downloadvcpkg-a4368eabea44fa350b8aad89a9974b0a17eeefcd.tar.gz
vcpkg-a4368eabea44fa350b8aad89a9974b0a17eeefcd.zip
[pkgconf] Update to 1.8 (and a few extras; world rebuild) (#20243)
* [vcpkg/script/meson] add option NO_PKG_CONFIG to skip pkg-config setup * [vcpkg/script/pkgconfig] move vcpkg_find_acquire_program(PKGCONFIG) into the check section where it is used * [pkgconf] Update to 1.8.0 * version stuff * remove unused patch. * (CR) quote string * version update.
Diffstat (limited to 'docs')
-rw-r--r--docs/maintainers/vcpkg_configure_meson.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/maintainers/vcpkg_configure_meson.md b/docs/maintainers/vcpkg_configure_meson.md
index a0bfc8a99..ae8a07d87 100644
--- a/docs/maintainers/vcpkg_configure_meson.md
+++ b/docs/maintainers/vcpkg_configure_meson.md
@@ -8,6 +8,7 @@ Configure Meson for Debug and Release builds of a project.
```cmake
vcpkg_configure_meson(
SOURCE_PATH <${SOURCE_PATH}>
+ [NO_PKG_CONFIG]
[OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...]
[OPTIONS_RELEASE <-DOPTIMIZE=1>...]
[OPTIONS_DEBUG <-DDEBUGGABLE=1>...]
@@ -28,6 +29,9 @@ Additional options passed to Meson during the Release configuration. These are i
### OPTIONS_DEBUG
Additional options passed to Meson during the Debug configuration. These are in addition to `OPTIONS`.
+### NO_PKG_CONFIG
+Disable pkg-config setup
+
## Notes
This command supplies many common arguments to Meson. To see the full list, examine the source.