Meson: avoid using deprecated feature (#2895)
This commit is contained in:
parent
2cc1947177
commit
26de04d147
|
@ -229,7 +229,7 @@ VIPS_EXEEXT=$EXEEXT
|
||||||
AC_SUBST(VIPS_EXEEXT)
|
AC_SUBST(VIPS_EXEEXT)
|
||||||
|
|
||||||
# cplusplus/Doxyfile.in needs an input and output directory ... they are the
|
# cplusplus/Doxyfile.in needs an input and output directory ... they are the
|
||||||
# same for copnfigure, but meson has separate source and build areas
|
# same for configure, but meson has separate source and build areas
|
||||||
DOXY_INPUT_DIRECTORY=$ac_pwd/$srcdir/cplusplus
|
DOXY_INPUT_DIRECTORY=$ac_pwd/$srcdir/cplusplus
|
||||||
DOXY_OUTPUT_DIRECTORY=$ac_pwd/$srcdir/cplusplus
|
DOXY_OUTPUT_DIRECTORY=$ac_pwd/$srcdir/cplusplus
|
||||||
AC_SUBST(DOXY_INPUT_DIRECTORY)
|
AC_SUBST(DOXY_INPUT_DIRECTORY)
|
||||||
|
|
|
@ -44,8 +44,7 @@ if get_option('doxygen')
|
||||||
doxygen_data = configuration_data()
|
doxygen_data = configuration_data()
|
||||||
doxygen_data.set('VIPS_MAJOR_VERSION', version_major)
|
doxygen_data.set('VIPS_MAJOR_VERSION', version_major)
|
||||||
doxygen_data.set('VIPS_MINOR_VERSION', version_minor)
|
doxygen_data.set('VIPS_MINOR_VERSION', version_minor)
|
||||||
doxygen_data.set('DOXY_INPUT_DIRECTORY',
|
doxygen_data.set('DOXY_INPUT_DIRECTORY', meson.current_source_dir())
|
||||||
join_paths(meson.source_root(), meson.current_source_dir()))
|
|
||||||
doxygen_data.set('DOXY_OUTPUT_DIRECTORY', 'cplusplus')
|
doxygen_data.set('DOXY_OUTPUT_DIRECTORY', 'cplusplus')
|
||||||
|
|
||||||
doxyfile = configure_file(
|
doxyfile = configure_file(
|
||||||
|
|
Loading…
Reference in New Issue