diff options
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 19 |
1 files changed, 11 insertions, 8 deletions
@@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net> +# Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net> # # This file is part of DCP-o-matic. # @@ -57,7 +57,6 @@ def options(opt): opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') - opt.add_option('--install-prefix', default=None, help='prefix of where DCP-o-matic will be installed') opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile for Windows') opt.add_option('--target-macos-arm64', action='store_true', default=False, help='set up to do a cross-compile for macOS arm64') opt.add_option('--static-dcpomatic', action='store_true', default=False, help='link to components of DCP-o-matic statically') @@ -93,10 +92,10 @@ def configure(conf): conf.env.DEBUG = conf.options.enable_debug conf.env.STATIC_DCPOMATIC = conf.options.static_dcpomatic conf.env.ENABLE_DISK = conf.options.enable_disk - if conf.options.install_prefix is None: + if conf.options.destdir is None: conf.env.INSTALL_PREFIX = conf.env.PREFIX else: - conf.env.INSTALL_PREFIX = conf.options.install_prefix + conf.env.INSTALL_PREFIX = conf.options.destdir # Common CXXFLAGS conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', @@ -477,6 +476,10 @@ def configure(conf): if conf.env.TARGET_LINUX: conf.env.LIB_X11 = ['X11'] + # We support older boosts on Linux so we can use the distribution-provided package + # on Centos 7, but it's good if we can use 1.61 for boost::dll::program_location() + boost_version = ('1.45', '104500') if conf.env.TARGET_LINUX else ('1.61', '106800') + # Boost if conf.options.static_boost: conf.env.STLIB_BOOST_THREAD = ['boost_thread'] @@ -488,15 +491,15 @@ def configure(conf): else: conf.check_cxx(fragment=""" #include <boost/version.hpp>\n - #if BOOST_VERSION < 104500\n + #if BOOST_VERSION < %s\n #error boost too old\n #endif\n int main(void) { return 0; }\n - """, + """ % boost_version[1], mandatory=True, - msg='Checking for boost library >= 1.45', + msg='Checking for boost library >= %s' % boost_version[0], okmsg='yes', - errmsg='too old\nPlease install boost version 1.45 or higher.') + errmsg='too old\nPlease install boost version %s or higher.' % boost_version[0]) conf.check_cxx(fragment=""" #include <boost/thread.hpp>\n |