diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-03-27 14:45:43 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-03-28 00:56:58 +0200 |
| commit | 4e52a0f7fd9f6490fe31781809f2871a918be458 (patch) | |
| tree | 7fc7025fc24e084aa05e041652b340acf5ec9fdd /test cases | |
| parent | 1bfd5e9dd21332e544f7234dda87b8efd02f06d6 (diff) | |
| download | meson-4e52a0f7fd9f6490fe31781809f2871a918be458.zip meson-4e52a0f7fd9f6490fe31781809f2871a918be458.tar.gz meson-4e52a0f7fd9f6490fe31781809f2871a918be458.tar.bz2 | |
boost: Better python module detection
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/frameworks/1 boost/meson.build | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build index ccfaa66..cb8c2df 100644 --- a/test cases/frameworks/1 boost/meson.build +++ b/test cases/frameworks/1 boost/meson.build @@ -29,28 +29,14 @@ python3dep = python3.dependency(required: host_machine.system() == 'linux', embe # compile python 2/3 modules only if we found a corresponding python version if(python2dep.found() and host_machine.system() == 'linux' and not s) - if(dep.version().version_compare('>=1.67')) - # if we have a new version of boost, we need to construct the module name based - # on the installed version of python (and hope that they match the version boost - # was compiled against) - py2version_string = ''.join(python2dep.version().split('.')) - bpython2dep = dependency('boost', static: s, modules : ['python' + py2version_string], required: false, disabler: true) - else - # if we have an older version of boost, we need to use the old module names - bpython2dep = dependency('boost', static: s, modules : ['python'], required: false, disabler: true) - endif + bpython2dep = dependency('boost', static: s, modules : ['python'], required: false, disabler: true) else python2dep = disabler() bpython2dep = disabler() endif if(python3dep.found() and host_machine.system() == 'linux' and not s) - if(dep.version().version_compare('>=1.67')) - py3version_string = ''.join(python3dep.version().split('.')) - bpython3dep = dependency('boost', static: s, modules : ['python' + py3version_string], required: false, disabler: true) - else - bpython3dep = dependency('boost', static: s, modules : ['python3'], required: false, disabler: true) - endif + bpython3dep = dependency('boost', static: s, modules : ['python3'], required: false, disabler: true) else python3dep = disabler() bpython3dep = disabler() |