diff options
| author | Iñigo MartÃnez <inigomartinez@gmail.com> | 2017-12-01 11:08:51 +0100 |
|---|---|---|
| committer | Iñigo MartÃnez <inigomartinez@gmail.com> | 2017-12-01 13:49:49 +0100 |
| commit | f8aab2f011afc93767a487cb68e856e21f9786d8 (patch) | |
| tree | bf96cb9bd6d2964fd5734e6b9e811f1054e6e9e8 | |
| parent | 44dd429ee5dd6d6efb04a1097c091077f9bcf6b9 (diff) | |
| download | meson-f8aab2f011afc93767a487cb68e856e21f9786d8.zip meson-f8aab2f011afc93767a487cb68e856e21f9786d8.tar.gz meson-f8aab2f011afc93767a487cb68e856e21f9786d8.tar.bz2 | |
dependencies: Use prefix variable with define_variable
The test used by the new define_variable parameter was using the
includedir directory. However, in order to get a successful test,
the includedir variables needs to be relative to the prefix
variable, otherwise the replacemente will not have any effect.
This changes uses the prefix variable itself because we can
assure that it will be present.
| -rw-r--r-- | test cases/linuxlike/1 pkg-config/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test cases/linuxlike/1 pkg-config/meson.build b/test cases/linuxlike/1 pkg-config/meson.build index 8a4940b..f72e111 100644 --- a/test cases/linuxlike/1 pkg-config/meson.build +++ b/test cases/linuxlike/1 pkg-config/meson.build @@ -18,7 +18,7 @@ zprefix = dep.get_pkgconfig_variable('prefix') # Always set but we can't be sure # pkg-config returns empty string for not defined variables assert(dep.get_pkgconfig_variable('nonexisting') == '', 'Value of unknown variable is not empty.') # pkg-config is able to replace variables -assert(dep.get_pkgconfig_variable('includedir', define_variable: ['prefix', '/tmp']) == '/tmp/include', 'prefix variable has not been replaced.') +assert(dep.get_pkgconfig_variable('prefix', define_variable: ['prefix', '/tmp']) == '/tmp', 'prefix variable has not been replaced.') # Test that dependencies of dependencies work. dep2 = declare_dependency(dependencies : dep) |