summaryrefslogtreecommitdiff
path: root/test cases/common
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-10-13 21:27:35 +0300
committerGitHub <noreply@github.com>2016-10-13 21:27:35 +0300
commitabfc95e75a1c2d0efc442d7d232a7b17a0207172 (patch)
treec79f5127b6bf7daafc09563ef1dd51690d9c89c7 /test cases/common
parent1efcea9617cee2f4e15768c52d3ba34634894abe (diff)
parent6ffae922cc7df4929bc0990a0991cf75fd7de57a (diff)
downloadmeson-abfc95e75a1c2d0efc442d7d232a7b17a0207172.tar.gz
Merge pull request #899 from centricular/pkgconfig-allow-libfoo-name
pkgconfig: Handle library names starting with 'lib'
Diffstat (limited to 'test cases/common')
-rw-r--r--test cases/common/51 pkgconfig-gen/installed_files.txt1
-rw-r--r--test cases/common/51 pkgconfig-gen/meson.build14
2 files changed, 13 insertions, 2 deletions
diff --git a/test cases/common/51 pkgconfig-gen/installed_files.txt b/test cases/common/51 pkgconfig-gen/installed_files.txt
index d6a23d716..3c44d28cf 100644
--- a/test cases/common/51 pkgconfig-gen/installed_files.txt
+++ b/test cases/common/51 pkgconfig-gen/installed_files.txt
@@ -1,2 +1,3 @@
usr/include/simple.h
usr/lib/pkgconfig/simple.pc
+usr/lib/pkgconfig/libfoo.pc
diff --git a/test cases/common/51 pkgconfig-gen/meson.build b/test cases/common/51 pkgconfig-gen/meson.build
index b5f692105..e31bfe6ee 100644
--- a/test cases/common/51 pkgconfig-gen/meson.build
+++ b/test cases/common/51 pkgconfig-gen/meson.build
@@ -15,5 +15,15 @@ pkgg.generate(
description : 'A simple demo library.',
requires : 'glib-2.0', # Not really, but only here to test that this works.
requires_private : ['gio-2.0', 'gobject-2.0'],
- libraries_private : '-lz',
-)
+ libraries_private : '-lz')
+
+# Test that name_prefix='' and name='libfoo' results in '-lfoo'
+lib2 = shared_library('libfoo', 'simple.c',
+ name_prefix : '',
+ version : libver)
+
+pkgg.generate(
+ libraries : lib2,
+ name : 'libfoo',
+ version : libver,
+ description : 'A foo library.')