diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-01-27 18:29:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-27 18:29:22 +0200 |
commit | a51c9af921d0ba05aa173b8a1a4351eacb575be0 (patch) | |
tree | 8207935e73c6c8e82f8c38c1ff130cbfe5642249 /docs/markdown/Dependencies.md | |
parent | 9e07f8d8e6bb088252ac11b3e663ff3d93c8020a (diff) | |
parent | 202c89d0b665a536a738c59dcde1f374047a346e (diff) | |
download | meson-a51c9af921d0ba05aa173b8a1a4351eacb575be0.zip meson-a51c9af921d0ba05aa173b8a1a4351eacb575be0.tar.gz meson-a51c9af921d0ba05aa173b8a1a4351eacb575be0.tar.bz2 |
Merge pull request #6423 from dcbaker/declare-dependency-variables
Add ability to set and query arbitrary variables on declare_dependency objects
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 |