mirror of https://github.com/GNOME/gimp.git
meson: Add explicit options for cfitsio and openmp
...instead of automagically enabling them if the dependency happens to be installed.
This commit is contained in:
parent
6f77a661c9
commit
8b2574e917
|
@ -1009,7 +1009,7 @@ if directx_sdk_path != '' and platform_windows
|
|||
endif
|
||||
conf.set('HAVE_DX_DINPUT', directx.found())
|
||||
|
||||
cfitsio_dep = dependency('cfitsio', required: false)
|
||||
cfitsio_dep = dependency('cfitsio', required: get_option('fits'))
|
||||
if cfitsio_dep.found()
|
||||
MIMEtypes += 'image/fits'
|
||||
endif
|
||||
|
@ -1366,7 +1366,7 @@ conf.set('HAVE_GETTEXT', true)
|
|||
conf.set10('ENABLE_MP', get_option('enable-multiproc'))
|
||||
|
||||
# Enable support for OpenMP
|
||||
openmp = dependency('openmp', required : false)
|
||||
openmp = dependency('openmp', required : get_option('openmp'))
|
||||
if openmp.found()
|
||||
have_openmp = true
|
||||
else
|
||||
|
|
|
@ -36,6 +36,7 @@ option('aa', type: 'feature', value: 'auto', description: 'AA plu
|
|||
option('alsa', type: 'feature', value: 'auto', description: 'Alsa support in midi input controller')
|
||||
option('appdata-test', type: 'feature', value: 'auto', description: 'Validate the appdata file')
|
||||
option('cairo-pdf', type: 'feature', value: 'auto', description: 'Cairo-pdf support')
|
||||
option('fits', type: 'feature', value: 'auto', description: 'Support for loading/exporting FITS images')
|
||||
option('ghostscript', type: 'feature', value: 'auto', description: 'Ghostscript support')
|
||||
option('gudev', type: 'feature', value: 'auto', description: 'Gudev support')
|
||||
option('heif', type: 'feature', value: 'auto', description: 'HEIF support')
|
||||
|
@ -44,6 +45,7 @@ option('jpeg2000', type: 'feature', value: 'auto', description: 'Jpeg-2
|
|||
option('jpeg-xl', type: 'feature', value: 'auto', description: 'JPEG XL support')
|
||||
option('mng', type: 'feature', value: 'auto', description: 'Mng support')
|
||||
option('openexr', type: 'feature', value: 'auto', description: 'Openexr support')
|
||||
option('openmp', type: 'feature', value: 'auto', description: 'OpenMP support')
|
||||
option('print', type: 'boolean', value: true, description: 'Print support')
|
||||
option('webkit-unmaintained',type: 'boolean', value: false, description: 'Help browser and webpage plugins (unmaintained)')
|
||||
option('webp', type: 'feature', value: 'auto', description: 'Webp support')
|
||||
|
|
Loading…
Reference in New Issue