diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-08 00:12:06 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-08-08 19:31:13 +0300 |
| commit | a8694f4b261fbe3a854d2a2d72742fde9a67d4b3 (patch) | |
| tree | 163ea06c6387916fcf45cca75b2e59c0d8f43dab /test cases | |
| parent | ddb1238ee2dc22052563c479d26c03b569f8ea32 (diff) | |
| download | meson-a8694f4b261fbe3a854d2a2d72742fde9a67d4b3.zip meson-a8694f4b261fbe3a854d2a2d72742fde9a67d4b3.tar.gz meson-a8694f4b261fbe3a854d2a2d72742fde9a67d4b3.tar.bz2 | |
Don't check version for fallback not-found dependency
Otherwise we get an error while checking the subproject version:
Uncomparable version string 'none'.
If the dependency was found as a not-found dependency in the
subproject and is not required, just take it.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build | 1 | ||||
| -rw-r--r-- | test cases/common/176 subproject nested subproject dirs/meson.build | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build index ea4cc9b..1720d3e 100644 --- a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build +++ b/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build @@ -1,3 +1,4 @@ project('beta project', 'c') lb = shared_library('b', 'b.c') +notfound = dependency('', required : false) diff --git a/test cases/common/176 subproject nested subproject dirs/meson.build b/test cases/common/176 subproject nested subproject dirs/meson.build index a4d0a97..875eed3 100644 --- a/test cases/common/176 subproject nested subproject dirs/meson.build +++ b/test cases/common/176 subproject nested subproject dirs/meson.build @@ -3,5 +3,9 @@ project('gamma project', 'c', subproject_dir: 'contrib/subprojects') a = subproject('alpha') lib = a.get_variable('l') +# Ensure that the dependency version is not checked for a not-found dependency +notfound = dependency('', version : '>=1.0', required : false, + fallback : ['beta', 'notfound']) + exe = executable('prog', 'prog.c', link_with : lib) test('basic', exe) |