From bfafb83069724cfd12882dc022d7217bfb536761 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Wed, 30 Jun 2021 15:16:14 +0100 Subject: Improve text for dependency detection methods Make it clear that search order for 'auto' there only applies to generic dependency names. Drop 'system' from that list, as it's not actually used for generic dependencies (nor is it defined what it would do). --- docs/markdown/Dependencies.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index 832832b..d4a371b 100644 --- a/docs/markdown/Dependencies.md +++ b/docs/markdown/Dependencies.md @@ -136,23 +136,24 @@ Since they can be used interchangeably, the rest of the build definitions do not need to care which one it is. Meson will take care of all the work behind the scenes to make this work. -# Dependency method +# Dependency detection method You can use the keyword `method` to let Meson know what method to use when searching for the dependency. The default value is `auto`. -Additional dependencies methods are `pkg-config`, `config-tool`, `cmake`, +Additional methods are `pkg-config`, `config-tool`, `cmake`, `builtin`, `system`, `sysconfig`, `qmake`, `extraframework` and `dub`. ```meson cups_dep = dependency('cups', method : 'pkg-config') ``` -The dependency method order for `auto` is: +For dependencies without [specific detection +logic](#dependencies-with-custom-lookup-functionality), the dependency method +order for `auto` is: 1. `pkg-config` 2. `cmake` 3. `extraframework` (OSX only) - 4. `system` ## System -- cgit v1.1