From 614fe4639a50d0988f38481cff3e897d65a15cbd 2019-04-12 17:20:08
From: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Date: 2019-04-12 17:20:08
Subject: [PATCH] Updated meson build defs

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

---

diff --git a/core b/core
index 7c86e13..bf13292 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 7c86e13f8a6242eb5fe07f0da91a96a4cf68b5bf
+Subproject commit bf13292f0caf950333841131d023ed7cd96a97a2
diff --git a/gui/meson.build b/gui/meson.build
index 21fdd77..f4dcf46 100644
--- a/gui/meson.build
+++ b/gui/meson.build
@@ -58,7 +58,8 @@ gui_moc_headers = [
  './include/Actions/ActionsGuiController.h',
  './include/Actions/FilteringAction.h',
  './include/Actions/SelectionZoneAction.h'
-]
+ ]
+
 
 gui_ui_files = [
  './ui/Settings/SqpSettingsGeneralWidget.ui',
@@ -95,7 +96,7 @@ gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
                                ui_files : gui_ui_files)
 
 gui_sources = [
-  './src/Common/ColorUtils.cpp',
+ './src/Common/ColorUtils.cpp',
  './src/Common/VisualizationDef.cpp',
  './src/SqpApplication.cpp',
  './src/DragAndDrop/DragDropTabSwitcher.cpp',
@@ -147,8 +148,8 @@ gui_sources = [
  './src/Visualization/SqpColorScale.cpp',
  './src/Actions/FilteringAction.cpp',
  './src/Actions/SelectionZoneAction.cpp',
- './src/Actions/ActionsGuiController.cpp',
-]
+ './src/Actions/ActionsGuiController.cpp'
+ ]
 
 gui_inc = include_directories(['include', 'include/Visualization'])
 
diff --git a/gui/src/Visualization/VisualizationGraphHelper.cpp b/gui/src/Visualization/VisualizationGraphHelper.cpp
index d6588e2..198255f 100644
--- a/gui/src/Visualization/VisualizationGraphHelper.cpp
+++ b/gui/src/Visualization/VisualizationGraphHelper.cpp
@@ -275,7 +275,6 @@ struct PlottablesUpdater<T,
                     maxValue = std::max( maxValue, std::max_element(v.begin(), v.end())->v() );
                 });
         }
-
         plot.yAxis->setRange(QCPRange { minValue, maxValue });
     }
 
diff --git a/plugins/python_providers/include/python_interpreter.h b/plugins/python_providers/include/python_interpreter.h
index 792c44c..ca00d66 100644
--- a/plugins/python_providers/include/python_interpreter.h
+++ b/plugins/python_providers/include/python_interpreter.h
@@ -1,4 +1,3 @@
-#include <Data/DateTimeRange.h>
 #include <TimeSeries.h>
 #include <functional>
 #include <iostream>
diff --git a/plugins/python_providers/meson.build b/plugins/python_providers/meson.build
index 01fe463..c8fd744 100644
--- a/plugins/python_providers/meson.build
+++ b/plugins/python_providers/meson.build
@@ -22,16 +22,27 @@ gen = generator(moc,
 
 python_providers_moc_files = gen.process(python_providers_moc_headers)
 
-cpp_args = ['-DPYTHON_PROVIDERS_LIB','-DQT_PLUGIN', '-DQT_NO_KEYWORDS']
+cpp_args = ['-DPYTHON_PROVIDERS_LIB','-DQT_PLUGIN']
 if(get_option('default_library')=='static')
     cpp_args += ['-DQT_STATICPLUGIN']
 endif
 
+sciqlop_python_interpreter = library('python_interpreter',
+                                     ['src/python_interpreter.cpp'],
+                                     include_directories : [python_providers_inc],
+                                     dependencies : [pybind11_dep, sciqlop_core],
+                                     cpp_args : ['-DQT_NO_KEYWORDS'],
+                                     install : true,
+                                     install_dir : join_paths(get_option('libdir'), 'SciQLop')
+                                     )
+
+
 sciqlop_python_providers = library('pythonproviders',
                        python_providers_sources,
                        python_providers_moc_files,
                        cpp_args : cpp_args,
                        include_directories : [python_providers_inc],
+                       link_with : [sciqlop_python_interpreter],
                        dependencies : [sciqlop_core, sciqlop_gui, pybind11_dep],
                        install : true,
                        install_dir : join_paths(get_option('libdir'), 'SciQLop')