X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=1785b893cdd0be8b5e3218c98a625deb142591c0;hb=aeb2f36ede25d6e8ce583592c23bbb1dfb05041e;hp=fe7182fb92a05b555fae2a64a455b461aef9d37e;hpb=dd88a3738c91b6fa2574c3d2d778fb30a412555c;p=libdcp.git diff --git a/wscript b/wscript index fe7182fb..1785b893 100644 --- a/wscript +++ b/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2016 Carl Hetherington +# Copyright (C) 2012-2019 Carl Hetherington # # This file is part of libdcp. # @@ -34,27 +34,41 @@ import subprocess import os import sys +import shlex import distutils.spawn from waflib import Logs, Context APPNAME = 'libdcp' -VERSION = '1.3.4devel' + +this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0] +last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] + +if this_version == '': + VERSION = '%sdevel' % last_version[1:].strip() +else: + VERSION = this_version[1:].strip() + API_VERSION = '-1.0' def options(opt): opt.load('compiler_cxx') opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows') opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') - opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-cth') + opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-carl') opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') opt.add_option('--disable-gcov', action='store_true', default=False, help='don''t use gcov in tests') opt.add_option('--disable-examples', action='store_true', default=False, help='disable building of examples') 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('--jpeg', default='oj2', help='specify JPEG library to build with: oj1 or oj2 for OpenJPEG 1.5.x or OpenJPEG 2.1.x respectively') + opt.add_option('--force-cpp11', action='store_true', default=False, help='force use of C++11') def configure(conf): conf.load('compiler_cxx') + conf.load('clang_compilation_database', tooldir=['waf-tools']) conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS']) + if conf.options.force_cpp11: + conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS']) gcc = conf.env['CC_VERSION'] if int(gcc[0]) >= 4 and int(gcc[1]) > 1: conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized']) @@ -81,7 +95,12 @@ def configure(conf): if conf.options.enable_openmp: conf.env.append_value('CXXFLAGS', ['-fopenmp', '-DLIBDCP_OPENMP']) - conf.env.LIB_OPENMP = ['gomp'] + conf.env.LIB_OPENMP = [conf.options.openmp] + conf.env.append_value('LDFLAGS', ['-l%s' % conf.options.openmp]) + conf.check_cxx(cxxflags='-fopenmp', msg='Checking that compiler supports -fopenmp') + + if not conf.env.TARGET_WINDOWS: + conf.env.append_value('LINKFLAGS', '-pthread') if conf.options.jpeg == 'oj1': conf.env.append_value('CXXFLAGS', ['-DLIBDCP_OPENJPEG1']) @@ -98,7 +117,7 @@ def configure(conf): # 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) + 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) @@ -106,6 +125,7 @@ def configure(conf): 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) + conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=False) if conf.options.static: if conf.options.jpeg == 'oj2': @@ -114,9 +134,9 @@ def configure(conf): elif conf.options.jpeg == 'oj1': conf.check_cfg(package='libopenjpeg1', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) conf.env.STLIB_OPENJPEG = ['openjpeg'] - conf.check_cfg(package='libasdcp-cth', atleast_version='0.0.1', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) conf.env.HAVE_ASDCPLIB_CTH = 1 - conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-cth', 'kumu-cth'] + conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-carl', 'kumu-carl'] conf.env.HAVE_CXML = 1 conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4'] conf.env.STLIB_CXML = ['cxml'] @@ -125,8 +145,8 @@ def configure(conf): conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) elif conf.options.jpeg == 'oj1': conf.check_cfg(package='libopenjpeg1', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) - conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.0', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) - conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags --libs', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) if conf.options.target_windows: boost_lib_suffix = '-mt' @@ -177,17 +197,20 @@ def configure(conf): lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store='BOOST_DATETIME') + conf.check_cxx(fragment=""" + #include \n + int main() { boost::regex ex("a"); }\n + """, + msg='Checking for boost regex library', + libpath='/usr/local/lib', + lib=['boost_regex%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], + uselib_store='BOOST_REGEX') + if not conf.env.DISABLE_TESTS: conf.recurse('test') if not conf.options.disable_gcov: conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False) - - # libxml++ 2.39.1 and later must be built with -std=c++11 - libxmlpp_version = conf.cmd_and_log(['pkg-config', '--modversion', 'libxml++-2.6'], output=Context.STDOUT, quiet=Context.BOTH) - s = libxmlpp_version.split('.') - v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2]) - if v >= 0x022701: - conf.env.append_value('CXXFLAGS', '-std=c++11') + conf.env.append_value('LINKFLAGS', '-fprofile-arcs') def build(bld): create_version_cc(bld, VERSION)