aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-08-13 23:42:38 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2017-08-13 23:42:38 +0300
commit55165ba504ce107c0636986087ba1139308d6fcb (patch)
tree6596e10480f57b9f89e57b806269afbb2e1e4ec6
parent8c8e9230a532196da0072e82df1452fa8486176b (diff)
downloadmeson-55165ba504ce107c0636986087ba1139308d6fcb.zip
meson-55165ba504ce107c0636986087ba1139308d6fcb.tar.gz
meson-55165ba504ce107c0636986087ba1139308d6fcb.tar.bz2
Added documentation for pcap dependency.
-rw-r--r--docs/markdown/Dependencies.md10
-rw-r--r--docs/markdown/Release-notes-for-0.42.0.md9
2 files changed, 19 insertions, 0 deletions
diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md
index 401e019..faf4102 100644
--- a/docs/markdown/Dependencies.md
+++ b/docs/markdown/Dependencies.md
@@ -90,6 +90,16 @@ q5exe = executable('qt5test',
Here we have an UI file created with Qt Designer and one source and header file each that require preprocessing with the `moc` tool. We also define a resource file to be compiled with `rcc`. We just have to tell Meson which files are which and it will take care of invoking all the necessary tools in the correct order, which is done with the `preprocess` method of the `qt5` module. Its output is simply put in the list of sources for the target. The `modules` keyword of `dependency` works just like it does with Boost. It tells which subparts of Qt the program uses.
+## Pcap
+
+The pcap library does not ship with pkg-config at the time or writing
+but instead it has its own `pcap-config` util. Meson will use it
+automatically:
+
+```meson
+pcap_dep = dependency('pcap', version : '>=1.0')
+```
+
## Declaring your own
You can declare your own dependency objects that can be used interchangeably with dependency objects obtained from the system. The syntax is straightforward:
diff --git a/docs/markdown/Release-notes-for-0.42.0.md b/docs/markdown/Release-notes-for-0.42.0.md
index 5472341..1ed74dc 100644
--- a/docs/markdown/Release-notes-for-0.42.0.md
+++ b/docs/markdown/Release-notes-for-0.42.0.md
@@ -131,3 +131,12 @@ like this:
The old commands are still available but they are deprecated
and will be removed in some future release.
+
+## Pcap dependency detector
+
+Meson will automatically obtain dependency information for pcap
+using the `pcap-config` tool. It is used like any other dependency:
+
+```meson
+pcap_dep = dependency('pcap', version : '>=1.0')
+```