diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2020-01-07 11:43:31 -0800 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2020-01-09 11:02:17 -0800 |
commit | 202c89d0b665a536a738c59dcde1f374047a346e (patch) | |
tree | 80272f741d850048230f86253ddd37621d0fc10b /docs/markdown/Dependencies.md | |
parent | cd895be99a7917e8c052ec7bb6088704c87783ae (diff) | |
download | meson-202c89d0b665a536a738c59dcde1f374047a346e.zip meson-202c89d0b665a536a738c59dcde1f374047a346e.tar.gz meson-202c89d0b665a536a738c59dcde1f374047a346e.tar.bz2 |
docs: Add documentation for variables keyword
In declare_dependency() and dependency.get_variables().
Diffstat (limited to 'docs/markdown/Dependencies.md')
-rw-r--r-- | docs/markdown/Dependencies.md | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index e029a84..d21bb97 100644 --- a/docs/markdown/Dependencies.md +++ b/docs/markdown/Dependencies.md @@ -67,6 +67,7 @@ page](#dependencies-with-custom-lookup-functionality). # Arbitrary variables from dependencies that can be found multiple ways *Note* new in 0.51.0 +*new in 0.54.0, the `internal` keyword* When you need to get an arbitrary variables from a dependency that can be found multiple ways and you don't want to constrain the type you can use @@ -79,13 +80,14 @@ var = foo.get_variable(cmake : 'CMAKE_VAR', pkgconfig : 'pkg-config-var', config ``` It accepts the keywords 'cmake', 'pkgconfig', 'pkgconfig_define', -'configtool', and 'default_value'. 'pkgconfig_define' works just like the -'define_variable' argument to `get_pkgconfig_variable`. When this method is -invoked the keyword corresponding to the underlying type of the dependency -will be used to look for a variable. If that variable cannot be found or if -the caller does not provide an argument for the type of dependency, one of -the following will happen: If 'default_value' was provided that value will be -returned, if 'default_value' was not provided then an error will be raised. +'configtool', 'internal', and 'default_value'. 'pkgconfig_define' works just +like the 'define_variable' argument to `get_pkgconfig_variable`. When this +method is invoked the keyword corresponding to the underlying type of the +dependency will be used to look for a variable. If that variable cannot be +found or if the caller does not provide an argument for the type of +dependency, one of the following will happen: If 'default_value' was provided +that value will be returned, if 'default_value' was not provided then an +error will be raised. # Declaring your own @@ -289,16 +291,16 @@ libraries that have been compiled for single-threaded use instead. *(added 0.53.0)* -Enables compiling and linking against the CUDA Toolkit. The `version` -and `modules` keywords may be passed to request the use of a specific +Enables compiling and linking against the CUDA Toolkit. The `version` +and `modules` keywords may be passed to request the use of a specific CUDA Toolkit version and/or additional CUDA libraries, correspondingly: ```meson dep = dependency('cuda', version : '>=10', modules : ['cublas']) ``` -Note that explicitly adding this dependency is only necessary if you are -using CUDA Toolkit from a C/C++ file or project, or if you are utilizing +Note that explicitly adding this dependency is only necessary if you are +using CUDA Toolkit from a C/C++ file or project, or if you are utilizing additional toolkit libraries that need to be explicitly linked to. ## CUPS |