From dced6dde703f2cf7fc2980507139d67f6d5dcc9c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 27 Sep 2011 19:57:14 +0000 Subject: Load tools before autowaf.configure so e.g. --debug works correctly. git-svn-id: http://svn.drobilla.net/lad/trunk/raul@3497 a436a847-0d15-0410-975c-d299462d15a1 --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 6d5bf90..9e79b18 100644 --- a/wscript +++ b/wscript @@ -35,8 +35,8 @@ top = '.' out = 'build' def options(opt): - autowaf.set_options(opt) opt.load('compiler_cxx') + autowaf.set_options(opt) opt.add_option('--test', action='store_true', default=False, dest='build_tests', help="Build unit tests") opt.add_option('--log-colour', action='store_true', default=True, dest='log_colour', @@ -47,10 +47,10 @@ def options(opt): help="Use C++0x smart pointers instead of boost") def configure(conf): + conf.load('compiler_cxx') autowaf.configure(conf) conf.line_just = 40 autowaf.display_header('Raul Configuration') - conf.load('compiler_cxx') autowaf.check_pkg(conf, 'glib-2.0', atleast_version='2.2', uselib_store='GLIB', mandatory=True) autowaf.check_pkg(conf, 'gthread-2.0', atleast_version='2.14.0', -- cgit v1.2.1