diff options
| author | Lovell Fuller <github@lovell.info> | 2023-01-24 13:34:27 +0000 |
|---|---|---|
| committer | Lovell Fuller <github@lovell.info> | 2023-01-24 14:04:00 +0000 |
| commit | 77f04b43a7af1ff3ab93a40c26ea5b9809ea3575 (patch) | |
| tree | cdbd90d918ef475abcf69e85173f7166c06b82a8 /plugins | |
| parent | e71aeb6d8ad21ad5aea2240b531acf13853c8cd9 (diff) | |
| download | lcms2-77f04b43a7af1ff3ab93a40c26ea5b9809ea3575.tar.gz | |
Ensure plugins can be built and installed with Meson
- Ensure dependency on m(ath) library is explicit
- Ensure headers can be installed
- Ensure CI builds and tests fastfloat (to match autotools)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/fast_float/include/meson.build | 1 | ||||
| -rw-r--r-- | plugins/fast_float/meson.build | 1 | ||||
| -rw-r--r-- | plugins/fast_float/src/meson.build | 2 | ||||
| -rw-r--r-- | plugins/fast_float/testbed/meson.build | 2 | ||||
| -rw-r--r-- | plugins/threaded/include/meson.build | 2 | ||||
| -rw-r--r-- | plugins/threaded/meson.build | 1 |
6 files changed, 6 insertions, 3 deletions
diff --git a/plugins/fast_float/include/meson.build b/plugins/fast_float/include/meson.build new file mode 100644 index 0000000..4527b4a --- /dev/null +++ b/plugins/fast_float/include/meson.build @@ -0,0 +1 @@ +install_headers('lcms2_fast_float.h') diff --git a/plugins/fast_float/meson.build b/plugins/fast_float/meson.build index b5d2552..8f0114e 100644 --- a/plugins/fast_float/meson.build +++ b/plugins/fast_float/meson.build @@ -1,2 +1,3 @@ +subdir('include') subdir('src') subdir('testbed') diff --git a/plugins/fast_float/src/meson.build b/plugins/fast_float/src/meson.build index 93f0b34..e907c3b 100644 --- a/plugins/fast_float/src/meson.build +++ b/plugins/fast_float/src/meson.build @@ -32,7 +32,7 @@ liblcms2_fast_float = library( 'lcms2_fast_float', lcms2_fast_float_sources, gnu_symbol_visibility: 'hidden', - dependencies: liblcms2_dep, + dependencies: [liblcms2_dep, m_dep], include_directories: lcms2_fast_float_incdir, c_args: cargs, install: true, diff --git a/plugins/fast_float/testbed/meson.build b/plugins/fast_float/testbed/meson.build index 5aa2d1a..db55170 100644 --- a/plugins/fast_float/testbed/meson.build +++ b/plugins/fast_float/testbed/meson.build @@ -5,7 +5,7 @@ fast_float_testbed_srcs = files( fast_float_testbed = executable( 'fast_float_testbed', fast_float_testbed_srcs, - dependencies: [liblcms2_fast_float_dep, liblcms2_dep], + dependencies: [liblcms2_fast_float_dep, liblcms2_dep, m_dep], c_args: cargs + ['-DPROFILES_DIR="@0@"'.format(profiles_dir / '')], ) diff --git a/plugins/threaded/include/meson.build b/plugins/threaded/include/meson.build index 8b13789..d38e63d 100644 --- a/plugins/threaded/include/meson.build +++ b/plugins/threaded/include/meson.build @@ -1 +1 @@ - +install_headers('lcms2_threaded.h') diff --git a/plugins/threaded/meson.build b/plugins/threaded/meson.build index b5d2552..8f0114e 100644 --- a/plugins/threaded/meson.build +++ b/plugins/threaded/meson.build @@ -1,2 +1,3 @@ +subdir('include') subdir('src') subdir('testbed') |