HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1437:614fe4639a50

Updated meson build defs...

jeandet -

r1437:614fe4639a50

parent child

Context file:

r1437:614fe4639a50

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 7c86e13f8a6242eb5fe07f0da91a96a4cf68b5bf		1	Subproject commit bf13292f0caf950333841131d023ed7cd96a97a2

gui/meson.build +5 -4

              './include/Actions/ActionsGuiController.h',
              './include/Actions/FilteringAction.h',
              './include/Actions/SelectionZoneAction.h'
+             ]
             gui_ui_files = [
              './ui/Settings/SqpSettingsGeneralWidget.ui',
                                            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',
              './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'])

gui/src/Visualization/VisualizationGraphHelper.cpp 0 -1

                                 maxValue = std::max( maxValue, std::max_element(v.begin(), v.end())->v() );
                             });
                     }
                     plot.yAxis->setRange(QCPRange { minValue, maxValue });
                 }

plugins/python_providers/include/python_interpreter.h 0 -1

-            #include <Data/DateTimeRange.h>
             #include <TimeSeries.h>
             #include <functional>
             #include <iostream>

plugins/python_providers/meson.build +12 -1

             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')

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