diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-05-31 18:34:11 +0530 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2024-01-30 18:23:19 -0500 |
commit | 69840fada3dc0255fb0ba83e38f923070dc9efcc (patch) | |
tree | 5687b7873b774267de51e65c40f27ad669498643 | |
parent | f071eb5a4b11bcb21a13c62acff93603d1581ebb (diff) |
meson: Generate nice-version.h in the right builddir
We want it in the `nice/` subdir so that it gets picked up correctly
during uninstalled builds, such as in the gstreamer monorepo.
The `NICE_CHECK_VERSION` macro was non-functional in the monorepo
because of this.
-rw-r--r-- | docs/reference/libnice/libnice-sections.txt | 4 | ||||
-rw-r--r-- | gst/meson.build | 3 | ||||
-rw-r--r-- | meson.build | 9 | ||||
-rw-r--r-- | nice/meson.build | 13 | ||||
-rw-r--r-- | nice/nice-version.h.in | 30 |
5 files changed, 47 insertions, 12 deletions
diff --git a/docs/reference/libnice/libnice-sections.txt b/docs/reference/libnice/libnice-sections.txt index 011e8fd..5c428a3 100644 --- a/docs/reference/libnice/libnice-sections.txt +++ b/docs/reference/libnice/libnice-sections.txt @@ -82,6 +82,10 @@ nice_nomination_mode_get_type nice_proxy_type_get_type <SUBSECTION Private> NiceAgentClass +NICE_VERSION_MAJOR +NICE_VERSION_MICRO +NICE_VERSION_MINOR +NICE_VERSION_NANO </SECTION> <SECTION> diff --git a/gst/meson.build b/gst/meson.build index 572c6ab..4ed4794 100644 --- a/gst/meson.build +++ b/gst/meson.build @@ -12,8 +12,7 @@ libgstnice = library('gstnice', gst_nice_sources, c_args : gst_nice_args, include_directories: nice_incs, - dependencies: [nice_deps, gst_dep], - link_with: libnice, + dependencies: [libnice_dep, gst_dep], install_dir: gst_plugins_install_dir, install: true) plugins = [libgstnice] diff --git a/meson.build b/meson.build index 6a733b7..4faffb4 100644 --- a/meson.build +++ b/meson.build @@ -85,15 +85,6 @@ add_project_arguments('-D_GNU_SOURCE', '-DNICE_VERSION_NANO=' + version_nano, language: 'c') -version_conf = configuration_data() -version_conf.set('NICE_VERSION_MAJOR', version_major) -version_conf.set('NICE_VERSION_MINOR', version_minor) -version_conf.set('NICE_VERSION_MICRO', version_micro) -version_conf.set('NICE_VERSION_NANO', version_nano) -nice_version_h = configure_file(output: 'nice-version.h', - install_dir: get_option('includedir') / 'nice', - configuration: version_conf) - cdata = configuration_data() cdata.set_quoted('PACKAGE_STRING', meson.project_name()) diff --git a/nice/meson.build b/nice/meson.build index 6916781..b1daa44 100644 --- a/nice/meson.build +++ b/nice/meson.build @@ -1,4 +1,3 @@ -nice_gen_sources = [nice_version_h] nice_link_args = [] # libnice.def @@ -31,9 +30,21 @@ libnice = library('nice', link_depends: mapfile, install: true) +version_conf = configuration_data() +version_conf.set('version_major', version_major) +version_conf.set('version_minor', version_minor) +version_conf.set('version_micro', version_micro) +version_conf.set('version_nano', version_nano) +nice_version_h = configure_file(input : 'nice-version.h.in', + output: 'nice-version.h', + install_dir: get_option('includedir') / 'nice', + configuration: version_conf) + install_headers('nice.h', subdir: 'nice') nice_include = include_directories('.') +nice_gen_sources = [nice_version_h] + # introspection build_gir = gir.found() and not get_option('introspection').disabled() if build_gir diff --git a/nice/nice-version.h.in b/nice/nice-version.h.in new file mode 100644 index 0000000..6445ae8 --- /dev/null +++ b/nice/nice-version.h.in @@ -0,0 +1,30 @@ +/** + * NICE_VERSION_MAJOR: + * + * Private, use NICE_CHECK_VERSION + */ + +/** + * NICE_VERSION_MINOR: + * + * Private, use NICE_CHECK_VERSION + */ + +/** + * NICE_VERSION_MICRO: + * + * Private, use NICE_CHECK_VERSION + */ + +/** + * NICE_VERSION_NANO: + * + * Private, use NICE_CHECK_VERSION + */ + +#pragma once + +#define NICE_VERSION_MAJOR @version_major@ +#define NICE_VERSION_MINOR @version_minor@ +#define NICE_VERSION_MICRO @version_micro@ +#define NICE_VERSION_NANO @version_nano@ |