From 57495d107d54ec2b38e10b77c983aa6256aebdad Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 19 Feb 2022 23:27:37 +0100 Subject: Don't look for ImageMagick/GraphicsMagick if not building examples. --- wscript | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 97b7bf25..eee10843 100644 --- a/wscript +++ b/wscript @@ -124,13 +124,14 @@ def configure(conf): conf.env.DEFINES_XMLSEC1 = [f.replace('\\', '') for f in conf.env.DEFINES_XMLSEC1] # ImageMagick / GraphicsMagick - if distutils.spawn.find_executable('Magick++-config'): - conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True, msg='Checking for ImageMagick/GraphicsMagick') - else: - image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) - graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) - if image is None and graphics is None: - Logs.error('Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required') + if not conf.options.disable_examples: + if distutils.spawn.find_executable('Magick++-config'): + conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True, msg='Checking for ImageMagick/GraphicsMagick') + else: + image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) + graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) + if image is None and graphics is None: + Logs.error('Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required') conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False) -- cgit v1.2.3