From 27bb7f924014a33e03b2142d37209a09546f706a 2019-04-16 01:26:25 From: Alexis Jeandet Date: 2019-04-16 01:26:25 Subject: [PATCH] Updated Meson build defs Signed-off-by: Alexis Jeandet --- diff --git a/core b/core index bf13292..0c2e5a7 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit bf13292f0caf950333841131d023ed7cd96a97a2 +Subproject commit 0c2e5a797af54f4f9e5ee1a715b642abb74d4368 diff --git a/plugins/meson.build b/plugins/meson.build index 530f572..d1be09b 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,3 +1,3 @@ -subdir('mockplugin') +#subdir('mockplugin') subdir('python_providers') #subdir('amda') diff --git a/plugins/python_providers/meson.build b/plugins/python_providers/meson.build index c8fd744..17eca0e 100644 --- a/plugins/python_providers/meson.build +++ b/plugins/python_providers/meson.build @@ -22,6 +22,8 @@ gen = generator(moc, python_providers_moc_files = gen.process(python_providers_moc_headers) +python_providers_prep_files = qt5.preprocess(qresources : 'resources/python_providers.qrc') + cpp_args = ['-DPYTHON_PROVIDERS_LIB','-DQT_PLUGIN'] if(get_option('default_library')=='static') cpp_args += ['-DQT_STATICPLUGIN'] @@ -40,6 +42,7 @@ sciqlop_python_interpreter = library('python_interpreter', sciqlop_python_providers = library('pythonproviders', python_providers_sources, python_providers_moc_files, + python_providers_prep_files, cpp_args : cpp_args, include_directories : [python_providers_inc], link_with : [sciqlop_python_interpreter],