##// END OF EJS Templates
Minor build fixes on Python stuff detection...
jeandet -
r1488:dd3017c130fb
parent child
Show More
@@ -2,7 +2,9 shiboken2 = find_program('shiboken2')
2 qmake = find_program('qmake-qt5','qmake')
2 qmake = find_program('qmake-qt5','qmake')
3
3
4 pymod = import('python')
4 pymod = import('python')
5 python3 = pymod.find_installation('python3', modules:['PySide2','shiboken2', 'shiboken2_generator'])
5 python3 = pymod.find_installation('python3', modules:['PySide2','shiboken2', 'shiboken2_generator', 'numpy'])
6 python3_dep = python3.dependency()
7 numpy_inc = run_command(python3, '-c', 'import numpy;print(numpy.get_include())').stdout().strip('\n')
6
8
7 qt5_modules = ['QtCore','QtGui','QtWidgets']
9 qt5_modules = ['QtCore','QtGui','QtWidgets']
8
10
@@ -21,7 +23,8 sciqlop_bindings_incs = shiboken2_build_flags + [
21 '-I'+meson.current_source_dir()+'/../../subprojects/TimeSeries/include',
23 '-I'+meson.current_source_dir()+'/../../subprojects/TimeSeries/include',
22 '-I'+meson.current_source_dir()+'/../../subprojects/cpp_utils/include',
24 '-I'+meson.current_source_dir()+'/../../subprojects/cpp_utils/include',
23 '-I'+python3.get_path('include'),
25 '-I'+python3.get_path('include'),
24 '-I'+qt_headers_path
26 '-I'+qt_headers_path,
27 '-I'+numpy_inc
25 ]
28 ]
26
29
27 foreach mod:qt5_modules
30 foreach mod:qt5_modules
@@ -37,7 +40,8 subdir('plugins')
37 shiboken_dep = declare_dependency(compile_args: shiboken2_build_flags, link_args: shiboken2_link_flags)
40 shiboken_dep = declare_dependency(compile_args: shiboken2_build_flags, link_args: shiboken2_link_flags)
38
41
39 sciqlop_bindings = python3.extension_module('SciQLopBindings',sciqlop_bindings_src,shiboken2_generator_out,
42 sciqlop_bindings = python3.extension_module('SciQLopBindings',sciqlop_bindings_src,shiboken2_generator_out,
40 dependencies : [sciqlop_app_dep, python3.dependency(), shiboken_dep, cpp_utils_dep],
43 dependencies : [sciqlop_app_dep, python3_dep, shiboken_dep, cpp_utils_dep],
44 include_directories : numpy_inc
41 )
45 )
42
46
43
47
@@ -1,5 +1,12
1 project('SciQLOP', 'cpp',default_options : ['cpp_std=c++17'], meson_version:'>=0.51.0')
1 project(
2 add_global_arguments('-DSCIQLOP_VERSION="1.1.0"', language : 'cpp')
2 'SciQLOP',
3 'cpp',
4 default_options : 'cpp_std=c++17',
5 meson_version : '>=0.51.0',
6 version : '1.1.0',
7 license : 'GPL3'
8 )
9 add_global_arguments('-DSCIQLOP_VERSION="@0@"'.format(meson.project_version()), language : 'cpp')
3
10
4 qt5 = import('qt5')
11 qt5 = import('qt5')
5 qt5core = dependency('qt5', modules : 'Core')
12 qt5core = dependency('qt5', modules : 'Core')
General Comments 0
You need to be logged in to leave comments. Login now