diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-07-01 14:43:51 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-07-01 20:50:47 +0530 |
| commit | 8ad4779a054a4d82c8d3d32978b3f7609b739cb4 (patch) | |
| tree | 0a120951e9be5ee402b8eab9c433d77123b17b0d | |
| parent | 45c8557dc67b7e8af8cef1aeb8b662dc9a6a4286 (diff) | |
| download | meson-8ad4779a054a4d82c8d3d32978b3f7609b739cb4.zip meson-8ad4779a054a4d82c8d3d32978b3f7609b739cb4.tar.gz meson-8ad4779a054a4d82c8d3d32978b3f7609b739cb4.tar.bz2 | |
Add test for installation of libraries in subprojects
The original test's subproject-install check had to be removed because
library names are now properly platform-specific
5 files changed, 45 insertions, 0 deletions
diff --git a/test cases/linuxlike/8 subproject library install/installed_files.txt b/test cases/linuxlike/8 subproject library install/installed_files.txt new file mode 100644 index 0000000..5c4a301 --- /dev/null +++ b/test cases/linuxlike/8 subproject library install/installed_files.txt @@ -0,0 +1,3 @@ +usr/lib/libsublib.so +usr/lib/libsublib.so.5 +usr/lib/libsublib.so.2.1.0 diff --git a/test cases/linuxlike/8 subproject library install/meson.build b/test cases/linuxlike/8 subproject library install/meson.build new file mode 100644 index 0000000..63e57cf --- /dev/null +++ b/test cases/linuxlike/8 subproject library install/meson.build @@ -0,0 +1,6 @@ +project('subproj lib install', 'c', + version : '2.3.4', + license : 'mylicense') + +# Test that the subproject library gets installed +subproject('sublib', version : '1.0.0') diff --git a/test cases/linuxlike/8 subproject library install/subprojects/sublib/include/subdefs.h b/test cases/linuxlike/8 subproject library install/subprojects/sublib/include/subdefs.h new file mode 100644 index 0000000..681c7b8 --- /dev/null +++ b/test cases/linuxlike/8 subproject library install/subprojects/sublib/include/subdefs.h @@ -0,0 +1,21 @@ +#ifndef SUBDEFS_H_ +#define SUBDEFS_H_ + +#if defined _WIN32 || defined __CYGWIN__ +#if defined BUILDING_SUB + #define DLL_PUBLIC __declspec(dllexport) +#else + #define DLL_PUBLIC __declspec(dllimport) +#endif +#else + #if defined __GNUC__ + #define DLL_PUBLIC __attribute__ ((visibility("default"))) + #else + #pragma message ("Compiler does not support symbol visibility.") + #define DLL_PUBLIC + #endif +#endif + +int DLL_PUBLIC subfunc(); + +#endif diff --git a/test cases/linuxlike/8 subproject library install/subprojects/sublib/meson.build b/test cases/linuxlike/8 subproject library install/subprojects/sublib/meson.build new file mode 100644 index 0000000..97658fa --- /dev/null +++ b/test cases/linuxlike/8 subproject library install/subprojects/sublib/meson.build @@ -0,0 +1,10 @@ +project('subproject', 'c', + version : '1.0.0', + license : ['sublicense1', 'sublicense2']) + +i = include_directories('include') +shared_library('sublib', 'sublib.c', + version : '2.1.0', + soversion : 5, + include_directories : i, install : true, + c_args : '-DBUILDING_SUB=2') diff --git a/test cases/linuxlike/8 subproject library install/subprojects/sublib/sublib.c b/test cases/linuxlike/8 subproject library install/subprojects/sublib/sublib.c new file mode 100644 index 0000000..c13326b --- /dev/null +++ b/test cases/linuxlike/8 subproject library install/subprojects/sublib/sublib.c @@ -0,0 +1,5 @@ +#include<subdefs.h> + +int DLL_PUBLIC subfunc() { + return 42; +} |