diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-12 23:02:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 23:02:36 +0200 |
| commit | 6585427a7d03e32770769863e1ae8902d4480745 (patch) | |
| tree | 4ee1359c40352a554e1eaf219b6b31b8b3eecdb2 /test cases | |
| parent | 28b19c78d6f9e12f9fc0f79748adbfed613eafc9 (diff) | |
| parent | 2377f22ea594ee10c98e90df438d437362cca5ea (diff) | |
| download | meson-6585427a7d03e32770769863e1ae8902d4480745.zip meson-6585427a7d03e32770769863e1ae8902d4480745.tar.gz meson-6585427a7d03e32770769863e1ae8902d4480745.tar.bz2 | |
Merge pull request #3131 from sarum9in/pkgconfig
Pkgconfig accepts libraries and pkgconfig-dependencies in requires/requires_private parameters
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/common/51 pkgconfig-gen/dependencies/meson.build | 16 | ||||
| -rw-r--r-- | test cases/common/51 pkgconfig-gen/meson.build | 6 |
2 files changed, 21 insertions, 1 deletions
diff --git a/test cases/common/51 pkgconfig-gen/dependencies/meson.build b/test cases/common/51 pkgconfig-gen/dependencies/meson.build index a767eb5..018b72f 100644 --- a/test cases/common/51 pkgconfig-gen/dependencies/meson.build +++ b/test cases/common/51 pkgconfig-gen/dependencies/meson.build @@ -21,7 +21,7 @@ custom_dep = declare_dependency(link_args : ['-lcustom'], compile_args : ['-DCUS custom2_dep = declare_dependency(link_args : ['-lcustom2'], compile_args : ['-DCUSTOM2']) # Generate a PC file: -# - Having libmain in libraries should pull implicitely libexposed and libinternal in Libs.private +# - Having libmain in libraries should pull implicitly libexposed and libinternal in Libs.private # - Having libexposed in libraries should remove it from Libs.private # - We generated a pc file for libexposed so it should be in Requires instead of Libs # - Having threads_dep in libraries should add '-pthread' in both Libs and Cflags @@ -36,3 +36,17 @@ pkgg.generate(libraries : [main_lib, exposed_lib, threads_dep , custom_dep], filebase : 'dependency-test', description : 'A dependency test.' ) + +pkgg.generate( + name : 'requires-test', + version : '1.0', + description : 'Dependency Requires field test.', + requires : [exposed_lib, pc_dep, 'libhello'], +) + +pkgg.generate( + name : 'requires-private-test', + version : '1.0', + description : 'Dependency Requires.private field test.', + requires_private : [exposed_lib, pc_dep, 'libhello', notfound_dep], +) diff --git a/test cases/common/51 pkgconfig-gen/meson.build b/test cases/common/51 pkgconfig-gen/meson.build index f9d7f7f..7e6c670 100644 --- a/test cases/common/51 pkgconfig-gen/meson.build +++ b/test cases/common/51 pkgconfig-gen/meson.build @@ -46,3 +46,9 @@ pkgg.generate( description : 'A foo library.', variables : ['foo=bar', 'datadir=${prefix}/data'] ) + +pkgg.generate( + name : 'libhello', + description : 'A minimalistic pkgconfig file.', + version : libver, +) |