HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1488:dd3017c130fb

Minor build fixes on Python stuff detection...

jeandet -

r1488:dd3017c130fb

parent child

Context file:

r1488:dd3017c130fb

app/PySide2-bindings/meson.build +7 -3

             shiboken2 = find_program('shiboken2')
             qmake = find_program('qmake-qt5','qmake')
             pymod = import('python')
-            python3 = pymod.find_installation('python3', modules:['PySide2','shiboken2', 'shiboken2_generator'])
+            python3 = pymod.find_installation('python3', modules:['PySide2','shiboken2', 'shiboken2_generator', 'numpy'])
+            python3_dep = python3.dependency()
+            numpy_inc = run_command(python3, '-c', 'import numpy;print(numpy.get_include())').stdout().strip('\n')
             qt5_modules = ['QtCore','QtGui','QtWidgets']
             qt_headers_path = run_command(qmake, '-query', 'QT_INSTALL_HEADERS').stdout().strip('\n')
             generated_srcs  = run_command(python3, 'src_list.py', 'meson').stdout().split(';')
             modules_arg = '--modules=@0@'.format(','.join(qt5_modules))
             shiboken2_build_flags = run_command(python3, 'shiboken-helper.py', '--includes', modules_arg).stdout().strip('\n').split(' ')
             shiboken2_link_flags  = run_command(python3, 'shiboken-helper.py', '--libs', modules_arg).stdout().strip('\n').split(' ')
             shiboken2_typesystem  = run_command(python3, 'shiboken-helper.py', '--typesystem').stdout().strip('\n')
             sciqlop_bindings_incs = shiboken2_build_flags + [
                 '-I'+meson.current_source_dir()+'/../../gui/include',
                 '-I'+meson.current_source_dir()+'/../../core/include',
                 '-I'+meson.current_source_dir()+'/../../subprojects/TimeSeries/include',
                 '-I'+meson.current_source_dir()+'/../../subprojects/cpp_utils/include',
                 '-I'+python3.get_path('include'),
-                '-I'+qt_headers_path
+                '-I'+qt_headers_path,
+                '-I'+numpy_inc
                 ]
             foreach mod:qt5_modules
                 sciqlop_bindings_incs += ['-I'+qt_headers_path+'/'+mod]
             endforeach
             sciqlop_bindings_src = files('bindings.h', 'PyDataProvider.h', 'numpy_wrappers.h', 'numpy_wrappers.cpp')
             subdir('SciQLopBindings')
             subdir('plugins')
             shiboken_dep = declare_dependency(compile_args: shiboken2_build_flags, link_args: shiboken2_link_flags)
             sciqlop_bindings = python3.extension_module('SciQLopBindings',sciqlop_bindings_src,shiboken2_generator_out,
-                    dependencies : [sciqlop_app_dep, python3.dependency(), shiboken_dep, cpp_utils_dep],
+                    dependencies : [sciqlop_app_dep, python3_dep, shiboken_dep, cpp_utils_dep],
+                    include_directories : numpy_inc
             )
             configure_file(input:'main.py', output:'main.py', copy:true)
             executable('sciqlop', 'main.cpp', dependencies :python3.dependency())

meson.build +9 -2

-            project('SciQLOP', 'cpp',default_options : ['cpp_std=c++17'], meson_version:'>=0.51.0')
+            project(
-            add_global_arguments('-DSCIQLOP_VERSION="1.1.0"', language : 'cpp')
+              'SciQLOP',
+              'cpp',
+              default_options : 'cpp_std=c++17',
+              meson_version : '>=0.51.0',
+              version : '1.1.0',
+              license : 'GPL3'
+            )
+            add_global_arguments('-DSCIQLOP_VERSION="@0@"'.format(meson.project_version()), language : 'cpp')
             qt5 = import('qt5')
             qt5core = dependency('qt5', modules : 'Core')
             qt5widgets = dependency('qt5', modules : 'Widgets')
             qt5gui = dependency('qt5', modules : 'Gui')
             qt5svg = dependency('qt5', modules : 'Svg')
             qt5xml = dependency('qt5', modules : 'Xml')
             qt5network = dependency('qt5', modules : 'Network')
             qt5printsupport = dependency('qt5', modules : 'PrintSupport')
             qt5Concurrent = dependency('qt5', modules : 'Concurrent')
             qt5test = dependency('qt5', modules : 'Test')
             cpp_utils_dep = dependency('cpp_utils', fallback:['cpp_utils','cpp_utils_dep'])
             moc = find_program('moc-qt5','moc')
             rcc = find_program('rcc-qt5','rcc')
             if build_machine.system()=='darwin'
               add_global_link_arguments('-headerpad_max_install_names', language : 'cpp')
               install_data('build_cfg/mac/sciqlopLOGO.icns', install_dir : 'Contents/Resources')
               install_data('build_cfg/mac/Info.plist', install_dir : 'Contents')
               meson.add_install_script('build_cfg/mac/install_script.sh')
             elif host_machine.system()=='windows'
               meson.add_install_script('build_cfg/windows/install_script.sh')
             elif host_machine.system()=='linux'
               install_data('app/resources/sciqlopLOGO.svg', install_dir : 'share/icons/hicolor/scalable/')
               install_data('app/resources/SciQLOP.desktop', install_dir : 'share/applications')
               install_data('app/resources/SciQLOP.appdata.xml', install_dir : 'share/metainfo')
             endif
             # Sets AMDA server that will be used during execution.
             # Available values are:
             # - "default": default AMDA server
             # - "amdatest": AMDA test server
             # - "hybrid": use both the default server and the test server (the server used is relative to each product, according to its "server" property in the JSON file)
             # - "localhost": use local AMDA server
             # Any other value will lead to the use of the default server
             add_project_arguments('-DSCIQLOP_AMDA_SERVER="hybrid"', language : 'cpp')
             subdir('core')
             subdir('gui')
             subdir('plugins')
             subdir('app')
             cppcheck = find_program('cppcheck', required : false)
             if cppcheck.found()
               run_target('cppcheck',
                           command : [cppcheck, '--enable=all',
                           '--project=' + join_paths(meson.build_root(), 'compile_commands.json')]
                           )
             endif

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages