diff options
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -68,18 +68,15 @@ def options(opt): opt.add_option('--disable-dumpimage', action='store_true', default=False, help='disable building of dcpdumpimage') opt.add_option('--enable-openmp', action='store_true', default=False, help='enable use of OpenMP') opt.add_option('--openmp', default='gomp', help='specify OpenMP Library to use: omp, gomp (default), iomp') - opt.add_option('--c++17', action='store_true', default=False, help='build with C++17 and libxml++-4.0') + opt.add_option('--c++17', action='store_true', default=False, help='build with C++17') + opt.add_option('--new-mm', action='store_true', default=False, help='build with libxml++-4.0') def configure(conf): conf.load('compiler_cxx') conf.load('clang_compilation_database', tooldir=['waf-tools']) - if vars(conf.options)['c++17']: - cpp_std = '17' - conf.env.XMLPP_API = '4.0' - else: - cpp_std = '11' - conf.env.XMLPP_API = '2.6' + cpp_std = '17' if vars(conf.options)['c++17'] else '11' + conf.env.XMLPP_API = '4.0' if vars(conf.options)['new_mm'] else '2.6' conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS', '-std=c++' + cpp_std]) gcc = conf.env['CC_VERSION'] |