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

add meson option to disable cplusplus api build

Browse Source
This commit is contained in:
John Cupitt 2022-12-15 11:20:10 +00:00
parent 43ab4bf886
commit 821e2165b9
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -27,6 +27,7 @@ master
- EXIF support for PNG load and save - EXIF support for PNG load and save
- deprecate gifsave reoptimise, add reuse - deprecate gifsave reoptimise, add reuse
- add "encoder" to heifsave [dloebl] - add "encoder" to heifsave [dloebl]
- add "cplusplus" meson build option [jcupitt]
9/11/22 started 8.13.4 9/11/22 started 8.13.4
- missing include in mosaic_fuzzer [ServOKio] - missing include in mosaic_fuzzer [ServOKio]

2
README.md
View File

@ -89,7 +89,7 @@ There are basic bash completions in `completions/`, see the README in there.
``` ```
cd libvips-x.y.x cd libvips-x.y.x
meson build --prefix /my/install/prefix meson setup build --prefix /my/install/prefix
cd build cd build
meson compile meson compile
meson test meson test

3
meson.build
View File

@ -637,6 +637,7 @@ build_summary = {
'enable doxygen': [get_option('doxygen')], 'enable doxygen': [get_option('doxygen')],
'enable introspection': [get_option('introspection')], 'enable introspection': [get_option('introspection')],
'enable examples': [get_option('examples')], 'enable examples': [get_option('examples')],
'enable cplusplus': [get_option('cplusplus')],
'enable RAD load/save': [get_option('radiance')], 'enable RAD load/save': [get_option('radiance')],
'enable Analyze7 load/save': [get_option('analyze')], 'enable Analyze7 load/save': [get_option('analyze')],
'enable PPM load/save': [get_option('ppm')], 'enable PPM load/save': [get_option('ppm')],
@ -689,7 +690,9 @@ endif
if get_option('examples') if get_option('examples')
subdir('examples') subdir('examples')
endif endif
if get_option('cplusplus')
subdir('cplusplus') subdir('cplusplus')
endif
# these lines removed by a regexp for oss-fuzz builds, don't touch! # these lines removed by a regexp for oss-fuzz builds, don't touch!
subdir('man') subdir('man')

5
meson_options.txt
View File

@ -10,6 +10,11 @@ option('examples',
value: true, value: true,
description: 'Build example programs') description: 'Build example programs')
option('cplusplus',
type: 'boolean',
value: true,
description: 'Build C++ API')
option('doxygen', option('doxygen',
type: 'boolean', type: 'boolean',
value: false, value: false,

2
test/test_threading.sh
View File

@ -48,7 +48,7 @@ fi
# setting VIPS_MAX_THREADS low should force a small thread limit # setting VIPS_MAX_THREADS low should force a small thread limit
echo -n "checking threadset size limit ... " echo -n "checking threadset size limit ... "
VIPS_MAX_THREADS=5 VIPS_CONCURRENCY=3 vips copy $image x.v || exit_code=$? VIPS_MAX_THREADS=5 VIPS_CONCURRENCY=3 $vips copy $image x.v || exit_code=$?
if [ $exit_code -ne 0 ]; then if [ $exit_code -ne 0 ]; then
echo FAILED echo FAILED
exit 1 exit 1