sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix oxygen

Browse Source 
see https://github.com/libvips/libvips/issues/2650#issuecomment-1050142161
This commit is contained in:
John Cupitt 2022-02-25 13:44:30 +00:00
parent a8b48e1442
commit b9e6bda6f7
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -228,6 +228,13 @@ VIPS_LIBDIR=$expanded_value
VIPS_EXEEXT=$EXEEXT VIPS_EXEEXT=$EXEEXT
AC_SUBST(VIPS_EXEEXT) AC_SUBST(VIPS_EXEEXT)
# cplusplus/Doxyfile.in needs an input and output directory ... they are the
# same for copnfigure, but meson has separate source and build areas
DOXY_INPUT_DIRECTORY=$ac_pwd/$srcdir/cplusplus
DOXY_OUTPUT_DIRECTORY=$ac_pwd/$srcdir/cplusplus
AC_SUBST(DOXY_INPUT_DIRECTORY)
AC_SUBST(DOXY_OUTPUT_DIRECTORY)
# vips.c/im_guess_prefix.c need to know the exe suffix and (as a fallback) # vips.c/im_guess_prefix.c need to know the exe suffix and (as a fallback)
# the configure-time install prefix # the configure-time install prefix
AC_DEFINE_UNQUOTED(VIPS_PREFIX,"$prefix",[configure-time install prefix]) AC_DEFINE_UNQUOTED(VIPS_PREFIX,"$prefix",[configure-time install prefix])

26
cplusplus/Doxyfile.in
View File

@ -58,7 +58,7 @@ PROJECT_LOGO =
# entered, it will be relative to the location where doxygen was started. If # entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used. # left blank the current directory will be used.
OUTPUT_DIRECTORY = @OUTPUT_DIRECTORY@ OUTPUT_DIRECTORY = @DOXY_OUTPUT_DIRECTORY@
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and # directories (in 2 levels) under the output directory of each output format and
@ -756,7 +756,7 @@ CITE_BIB_FILES =
# messages are off. # messages are off.
# The default value is: NO. # The default value is: NO.
QUIET = NO QUIET = YES
# The WARNINGS tag can be used to turn on/off the warning messages that are # The WARNINGS tag can be used to turn on/off the warning messages that are
# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES # generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
@ -824,17 +824,17 @@ WARN_LOGFILE =
# Note: If this tag is empty the current directory is searched. # Note: If this tag is empty the current directory is searched.
INPUT = \ INPUT = \
README.md \ @DOXY_INPUT_DIRECTORY@/README.md \
VConnection.cpp \ @DOXY_INPUT_DIRECTORY@/VConnection.cpp \
VError.cpp \ @DOXY_INPUT_DIRECTORY@/VError.cpp \
VImage.cpp \ @DOXY_INPUT_DIRECTORY@/VImage.cpp \
VInterpolate.cpp \ @DOXY_INPUT_DIRECTORY@/VInterpolate.cpp \
vips-operators.cpp \ @DOXY_INPUT_DIRECTORY@/vips-operators.cpp \
include/vips/VConnection8.h \ @DOXY_INPUT_DIRECTORY@/include/vips/VConnection8.h \
include/vips/VError8.h \ @DOXY_INPUT_DIRECTORY@/include/vips/VError8.h \
include/vips/VImage8.h \ @DOXY_INPUT_DIRECTORY@/include/vips/VImage8.h \
include/vips/VInterpolate8.h \ @DOXY_INPUT_DIRECTORY@/include/vips/VInterpolate8.h \
include/vips/vips8 @DOXY_INPUT_DIRECTORY@/include/vips/vips8
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

4
cplusplus/meson.build
View File

@ -41,7 +41,9 @@ 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('OUTPUT_DIRECTORY', 'cplusplus') doxygen_data.set('DOXY_INPUT_DIRECTORY',
join_paths(meson.source_root(), meson.current_source_dir()))
doxygen_data.set('DOXY_OUTPUT_DIRECTORY', 'cplusplus')
doxyfile = configure_file( doxyfile = configure_file(
input: 'Doxyfile.in', input: 'Doxyfile.in',