diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-09-14 22:16:01 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-09-15 14:27:21 +0200 |
| commit | 7cd1d82e33d074050b132dba8c4ae4e0d4804310 (patch) | |
| tree | be8a4e4e630450736b4cba12a518e1219a688c71 /wscript | |
| parent | de3466fa0e6b8fa39fda86d39c2d4792ec69ecbf (diff) | |
Allow building with boost::process v2 (added in Ubuntu 25.10).
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 22 |
1 files changed, 16 insertions, 6 deletions
@@ -626,22 +626,32 @@ def configure(conf): lib=['boost_regex%s' % boost_lib_suffix], uselib_store='BOOST_REGEX') - # Really just checking for the header here (there's no associated library) but the test - # program has to link with boost_system so I'm doing it this way. if conf.options.enable_disk: deps = ['boost_system%s' % boost_lib_suffix] if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32: deps.append('ws2_32') deps.append('boost_filesystem%s' % boost_lib_suffix) - conf.check_cxx(fragment=""" + deps.append('boost_process%s' % boost_lib_suffix) + v1 = conf.check_cxx(fragment=""" #include <boost/process.hpp>\n int main() { new boost::process::child("foo"); }\n """, cxxflags='-Wno-unused-parameter', - msg='Checking for boost process library', + msg='Checking for boost process library v1', lib=deps, - uselib_store='BOOST_PROCESS') - + define_name='DCPOMATIC_BOOST_PROCESS_V1', + uselib_store='BOOST_PROCESS', + mandatory=False) + if v1 is None: + conf.check_cxx(fragment=""" + #include <boost/process.hpp>\n + int main() { boost::asio::io_context ctx; new boost::process::v2::process(ctx, "foo", {}); }\n + """, + cxxflags='-Wno-unused-parameter', + msg='Checking for boost process library v2', + lib=deps, + define_name='DCPOMATIC_BOOST_PROCESS_V2', + uselib_store='BOOST_PROCESS') conf.check_cxx(fragment=""" #include <boost/asio.hpp> int main() { boost::asio::io_context context; } |
