From b77fa414f5aad2c9a0ec1f763b3765b899a7f1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Lind=C3=A9n?= Date: Fri, 10 Apr 2015 12:20:39 +0200 Subject: [PATCH] make build option --iio an auto option --- linux/wscript | 5 ----- wscript | 10 +++------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/linux/wscript b/linux/wscript index 4e2e8962..cb4b9d3f 100644 --- a/linux/wscript +++ b/linux/wscript @@ -6,11 +6,6 @@ from waflib import Context def configure(conf): conf.define('HAVE_PPOLL', 1 ) - conf.check_cfg(package='gtkIOStream', atleast_version='1.4.0', args='--cflags --libs', mandatory=False) - conf.env['BUILD_DRIVER_IIO'] = conf.is_defined('HAVE_GTKIOSTREAM') - conf.check_cfg(package='eigen3', atleast_version='3.1.2', args='--cflags --libs', mandatory=False) - conf.env['BUILD_DRIVER_IIO'] += conf.is_defined('HAVE_EIGEN3') - def create_jack_driver_obj(bld, target, sources, uselib = None): driver = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib']) driver.env['cxxshlib_PATTERN'] = 'jack_%s.so' diff --git a/wscript b/wscript index 1f72729a..0fe010b2 100644 --- a/wscript +++ b/wscript @@ -396,7 +396,9 @@ def options(opt): firewire.add_package('libffado', atleast_version='1.999.17') freebob = add_auto_option(opt, 'freebob', help='Enable FreeBob driver') freebob.add_package('libfreebob', atleast_version='1.0.0') - opt.add_option('--iio', action='store_true', default=False, help='Enable IIO driver') + iio = add_auto_option(opt, 'iio', help='Enable IIO driver', conf_dest='BUILD_DRIVER_IIO') + iio.add_package('gtkIOStream', atleast_version='1.4.0') + iio.add_package('eigen3', atleast_version='3.1.2') opt.add_option('--portaudio', action='store_true', default=False, help='Enable Portaudio driver') opt.add_option('--winmme', action='store_true', default=False, help='Enable WinMME driver') @@ -464,9 +466,6 @@ def configure(conf): conf.sub_config('common') if conf.env['IS_LINUX']: conf.sub_config('linux') - if Options.options.iio and not conf.env['BUILD_DRIVER_IIO']: - conf.fatal('IIO driver was explicitly requested but cannot be built') - conf.env['BUILD_DRIVER_IIO'] = Options.options.iio if conf.env['IS_WINDOWS']: conf.sub_config('windows') if Options.options.portaudio and not conf.env['BUILD_DRIVER_PORTAUDIO']: @@ -662,9 +661,6 @@ def configure(conf): # display configuration result messages for auto options display_auto_options_messages() - if conf.env['IS_LINUX']: - display_feature('Build with IIO support', conf.env['BUILD_DRIVER_IIO'] == True) - if conf.env['IS_WINDOWS']: display_feature('Build with WinMME support', conf.env['BUILD_DRIVER_WINMME'] == True) display_feature('Build with Portaudio support', conf.env['BUILD_DRIVER_PORTAUDIO'] == True)