HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1425:697deb00ef40

Updated meson build files...

jeandet -

r1425:697deb00ef40

parent child

Context file:

r1425:697deb00ef40

plugins/python_providers/meson.build created 644 +38 0

@@ -0,0 +1,38
	1
	2	pybind11_dep = dependency('pybind11', required : true, fallback:['pybind11','pybind11_dep'])
	3
	4	python_providers_moc_headers = [
	5	'include/python_providers.h'
	6	]
	7
	8	python_providers_sources = [
	9	'src/python_providers.cpp'
	10	]
	11
	12	python_providers_inc = include_directories(['include'])
	13
	14
	15	gen = generator(moc,
	16	output : 'moc_@BASENAME@.cpp',
	17	arguments : ['@INPUT@',
	18	'-DSCIQLOP_PLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/python_providers/resources/python_providers.json"',
	19	'-I', meson.current_source_dir()+'/include',
	20	'-I', meson.current_source_dir()+'/../../core/include/',
	21	'-o', '@OUTPUT@'])
	22
	23	python_providers_moc_files = gen.process(python_providers_moc_headers)
	24
	25	cpp_args = ['-DPYTHON_PROVIDERS_LIB','-DQT_PLUGIN', '-DQT_NO_KEYWORDS']
	26	if(get_option('default_library')=='static')
	27	cpp_args += ['-DQT_STATICPLUGIN']
	28	endif
	29
	30	sciqlop_python_providers = library('pythonproviders',
	31	python_providers_sources,
	32	python_providers_moc_files,
	33	cpp_args : cpp_args,
	34	include_directories : [python_providers_inc],
	35	dependencies : [sciqlop_core, sciqlop_gui, pybind11_dep],
	36	install : true,
	37	install_dir : join_paths(get_option('libdir'), 'SciQLop')
	38	)

app/meson.build +1 -1

             app_moc_headers = [
               'include/MainWindow.h'
             ]
             app_ui_files = [
               'ui/MainWindow.ui'
             ]
             app_qresources = ['resources/qlopapp.qrc']
             app_moc_files = qt5.preprocess(moc_headers : app_moc_headers,
                                            ui_files : app_ui_files,
                                            qresources : app_qresources)
             app_sources = [
               'src/Main.cpp',
               'src/MainWindow.cpp'
             ]
             app_inc = include_directories(['include'])
             if host_machine.system()=='windows' or build_machine.system()=='windows'
               winmod = import('windows')
               rc = winmod.compile_resources('resources/qlopapp.rc')
             else
               rc = []
             endif
             app_libs = []
             cpp_args = []
             if 'static' == get_option('default_library')
-              app_libs = [ sciqlop_amdaplugin, sciqlop_mockplugin]
+              app_libs = [sciqlop_mockplugin, sciqlop_python_providers]
               cpp_args += ['-DQT_STATICPLUGIN']
             endif
             sciqlop_app = executable('sciqlop',
                                    app_sources,
                                    app_moc_files,
                                    rc,
                                    include_directories : [ app_inc],
                                    link_with: app_libs,
                                    cpp_args: cpp_args,
                                    dependencies : [sciqlop_gui, sciqlop_core],
                                    install : true
                                    )

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit d831ff83b9bb13121444a5bd86040d4bddfe72d3		1	Subproject commit a0c89a70c83c407d12cf22096a0e7ffae4763e00

plugins/meson.build +2 -1

@@ -1,2 +1,3
1	subdir('mockplugin')	1	subdir('mockplugin')
2	subdir('amda')	2	subdir('python_providers')
		3	#subdir('amda')

plugins/python_providers/include/python_providers.h +1 0

             #ifndef PYTHON_PROVIDERS_H
             #define PYTHON_PROVIDERS_H
             #include <Plugin/IPlugin.h>
             #include <memory>
             #ifndef SCIQLOP_PLUGIN_JSON_FILE_PATH
             #define SCIQLOP_PLUGIN_JSON_FILE_PATH "python_providers.json"
             #endif
             class DataSourceItem;
             class PythonProviders : public QObject, public IPlugin
             {
                 Q_OBJECT
                 Q_INTERFACES(IPlugin)
                 Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE SCIQLOP_PLUGIN_JSON_FILE_PATH)
             public:
                 /// @sa IPlugin::initialize()
                 void initialize() override;
+                ~PythonProviders();
             };
             #endif // PYTHON_PROVIDERS_H

plugins/python_providers/src/python_providers.cpp +9 -1

             #include "python_providers.h"
             #include <pybind11/embed.h>
             namespace py = pybind11;
             void PythonProviders::initialize()
             {
-                py::scoped_interpreter guard {};
+                py::initialize_interpreter(false);
                 py::print("Hello, World!");
+                py::print("Hello, World!");
+                py::print("Hello, World!");
+                py::print("Hello, World!");
+            }
+            PythonProviders::~PythonProviders()
+            {
+                py::finalize_interpreter();
             }

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