diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-03-13 12:26:27 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-03-13 12:26:27 +0100 |
| commit | c7ff8e1367286d86ee33033982ab25b6cc6bfb01 (patch) | |
| tree | 2e0242d025752572133134433cf07103c644288a | |
| parent | ea94a3bc75c19a15c5a7099ae0dfaacdec19b70b (diff) | |
| download | sigc++-c7ff8e1367286d86ee33033982ab25b6cc6bfb01.tar.gz | |
Meson build: Require only meson.version() >= 0.51.0
meson.version() >= 0.54.0 is necessary if sigc++ is a subproject,
or if mm-common is a subproject of sigc++.
Only meson.version() <= 0.53.2 is available in CI. Make it possible
to build with version 0.53.2 as long as no subprojects are used.
| -rw-r--r-- | docs/docs/reference/meson.build | 14 | ||||
| -rw-r--r-- | meson.build | 6 |
2 files changed, 16 insertions, 4 deletions
diff --git a/docs/docs/reference/meson.build b/docs/docs/reference/meson.build index fb30c79..8bc659b 100644 --- a/docs/docs/reference/meson.build +++ b/docs/docs/reference/meson.build @@ -15,9 +15,17 @@ docinstall_flags = [] foreach module : tag_file_modules depmod = dependency(module, required: false) if depmod.found() - doxytagfile = depmod.get_variable(pkgconfig: 'doxytagfile', internal: 'doxytagfile') - htmlrefpub = depmod.get_variable(pkgconfig: 'htmlrefpub', internal: 'htmlrefpub', default_value: '') - htmlrefdir = depmod.get_variable(pkgconfig: 'htmlrefdir', internal: 'htmlrefdir', default_value: '') + if meson.version().version_compare('>=0.54.0') + doxytagfile = depmod.get_variable(pkgconfig: 'doxytagfile', internal: 'doxytagfile') + htmlrefpub = depmod.get_variable(pkgconfig: 'htmlrefpub', internal: 'htmlrefpub', default_value: '') + htmlrefdir = depmod.get_variable(pkgconfig: 'htmlrefdir', internal: 'htmlrefdir', default_value: '') + else + # TODO: Remove the possibility to build with meson.version() < 0.54.0 + # when >= 0.54.0 is available in GitHub's CI (continuous integration). + doxytagfile = depmod.get_variable(pkgconfig: 'doxytagfile') + htmlrefpub = depmod.get_variable(pkgconfig: 'htmlrefpub', default_value: '') + htmlrefdir = depmod.get_variable(pkgconfig: 'htmlrefdir', default_value: '') + endif if htmlrefpub == '' htmlrefpub = htmlrefdir elif htmlrefdir == '' diff --git a/meson.build b/meson.build index 14803a4..5f636ff 100644 --- a/meson.build +++ b/meson.build @@ -7,8 +7,12 @@ project('libsigc++', 'cpp', 'cpp_std=c++17', 'warning_level=0', ], - meson_version: '>= 0.54.0', # required for dep.get_variable(internal:) + meson_version: '>= 0.51.0', # required for dep.get_variable() ) +#TODO: Require meson_version: '>= 0.54.0' when it's available +# in GitHub's CI (continuous integration). +# meson_version() >= 0.54.0 is necessary if sigc++ is a subproject, +# or if mm-common is a subproject of sigc++. sigcxx_api_version = '3.0' sigcxx_pcname = 'sigc++-' + sigcxx_api_version |