Fix NICE_CHECK_VERSION in public install
authorTim-Philipp Müller <tim@centricular.com>
Thu, 26 May 2022 13:56:43 +0000 (14:56 +0100)
committerTim-Philipp Müller <tim@centricular.com>
Thu, 26 May 2022 14:01:12 +0000 (15:01 +0100)
Install a nice-version.h so that the version defines
are available.

https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/232

meson.build
nice/meson.build
nice/nice.h

index a4a5d3a..609dc47 100644 (file)
@@ -84,6 +84,15 @@ 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())
index 648ed20..6916781 100644 (file)
@@ -1,4 +1,4 @@
-nice_gen_sources = []
+nice_gen_sources = [nice_version_h]
 nice_link_args = []
 
 # libnice.def
index bb63129..4faf784 100644 (file)
@@ -39,6 +39,8 @@
 #ifndef _NICE_H
 #define _NICE_H
 
+#include "nice-version.h"
+
 #define NICE_CHECK_VERSION(major, minor, micro)                         \
     (NICE_VERSION_MAJOR > (major) ||                                    \
      (NICE_VERSION_MAJOR == (major) && NICE_VERSION_MINOR > (minor)) || \