From c2263bca05e32c852556fd7a7381f571d5403f7a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 6 Sep 2012 01:25:17 +0000 Subject: Don't use invalid strict flags on clang. Add outdir option to build_dox. git-svn-id: http://svn.drobilla.net/autowaf@76 e2e4594f-ea7b-45dc-bc5a-5f5301e603aa --- autowaf.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/autowaf.py b/autowaf.py index c34da0a..297f4e7 100644 --- a/autowaf.py +++ b/autowaf.py @@ -232,16 +232,26 @@ def configure(conf): append_cxx_flags(['-Wall', '-Wcast-align', '-Wextra', - '-Wlogical-op', '-Wmissing-declarations', '-Wno-unused-parameter', '-Wstrict-overflow', - '-Wsuggest-attribute=noreturn', '-Wundef', - '-Wunsafe-loop-optimizations', '-Wwrite-strings', '-fstrict-overflow']) + if not conf.check_cc(fragment = ''' +#ifndef __clang__ +#error +#endif +int main() { return 0; }''', + features = 'c', + mandatory = False, + execute = False, + msg = 'Checking for clang'): + append_cxx_flags(['-Wlogical-op', + '-Wsuggest-attribute=noreturn', + '-Wunsafe-loop-optimizations']) + if not conf.env['MSVC_COMPILER']: append_cxx_flags(['-fshow-column']) @@ -419,7 +429,7 @@ def make_simple_dox(name): Logs.error("Failed to fix up %s documentation: %s" % (name, e)) # Doxygen API documentation -def build_dox(bld, name, version, srcdir, blddir): +def build_dox(bld, name, version, srcdir, blddir, outdir=None): if not bld.env['DOCS']: return @@ -451,7 +461,7 @@ def build_dox(bld, name, version, srcdir, blddir): docs.post() - bld.install_files('${DOCDIR}/%s/html' % name.lower(), + bld.install_files(os.path.join('${DOCDIR}', name.lower(), outdir, 'html'), bld.path.get_bld().ant_glob('doc/html/*')) for i in range(1, 8): bld.install_files('${MANDIR}/man%d' % i, -- cgit v1.2.1