##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Added cpp_utils as subproject and removed few warnings...
jeandet -
r1485:4f6ae2f1ca26
parent child
Show More
Side by Side Unified
Context file:
r1485:4f6ae2f1ca26 Loading diff...:
Show file before | Show file after | Hide comments
@@ -19,6 +19,7 sciqlop_bindings_incs = shiboken2_build_flags + [
19 '-I'+meson.current_source_dir()+'/../../gui/include',
19 '-I'+meson.current_source_dir()+'/../../gui/include',
20 '-I'+meson.current_source_dir()+'/../../core/include',
20 '-I'+meson.current_source_dir()+'/../../core/include',
21 '-I'+meson.current_source_dir()+'/../../subprojects/TimeSeries/include',
21 '-I'+meson.current_source_dir()+'/../../subprojects/TimeSeries/include',
22 '-I'+meson.current_source_dir()+'/../../subprojects/cpp_utils/include',
22 '-I'+python3.get_path('include'),
23 '-I'+python3.get_path('include'),
23 '-I'+qt_headers_path
24 '-I'+qt_headers_path
24 ]
25 ]
@@ -35,7 +36,7 subdir('SciQLopBindings')
35 shiboken_dep = declare_dependency(compile_args: shiboken2_build_flags, link_args: shiboken2_link_flags)
36 shiboken_dep = declare_dependency(compile_args: shiboken2_build_flags, link_args: shiboken2_link_flags)
36
37
37 sciqlop_bindings = python3.extension_module('SciQLopBindings',sciqlop_bindings_src,shiboken2_generator_out,
38 sciqlop_bindings = python3.extension_module('SciQLopBindings',sciqlop_bindings_src,shiboken2_generator_out,
38 dependencies : [sciqlop_app_dep, python3.dependency(), shiboken_dep],
39 dependencies : [sciqlop_app_dep, python3.dependency(), shiboken_dep, cpp_utils_dep],
39 )
40 )
40
41
41
42
Show file before | Show file after | Hide comments
@@ -31,10 +31,14 extern "C"
31 #include <assert.h>
31 #include <assert.h>
32
32
33 #include <map>
33 #include <map>
34 #include <warnings.h>
34
35
35 inline int init_numpy()
36 inline int init_numpy()
36 {
37 {
38 DISABLE_WARNING_PUSH
39 DISABLE_WARNING_CONVERSION_NULL
37 import_array(); // PyError if not successful
40 import_array(); // PyError if not successful
41 DISABLE_WARNING_POP
38 return 0;
42 return 0;
39 }
43 }
40 const static int numpy_initialized = init_numpy();
44 const static int numpy_initialized = init_numpy();
Show file before | Show file after | Hide comments
@@ -40,8 +40,6 public:
40 int styleHint(StyleHint hint, const QStyleOption* option = nullptr,
40 int styleHint(StyleHint hint, const QStyleOption* option = nullptr,
41 const QWidget* widget = nullptr, QStyleHintReturn* returnData = nullptr) const override
41 const QWidget* widget = nullptr, QStyleHintReturn* returnData = nullptr) const override
42 {
42 {
43 if (widget)
44 auto cname = widget->metaObject()->className();
45 if (hint == QStyle::SH_ToolButton_PopupDelay && widget
43 if (hint == QStyle::SH_ToolButton_PopupDelay && widget
46 /*&& widget->inherits(QWidgetAction::staticMetaObject.className())*/)
44 /*&& widget->inherits(QWidgetAction::staticMetaObject.className())*/)
47 {
45 {
Show file before | Show file after | Hide comments
@@ -25,6 +25,7 auto build_CatalogueBrowser_test()
25 auto catalogue = sqpApp->catalogueController().add("new catalogue2", "default");
25 auto catalogue = sqpApp->catalogueController().add("new catalogue2", "default");
26 for (auto _ : std::array<char, EventsCount>())
26 for (auto _ : std::array<char, EventsCount>())
27 {
27 {
28 (void)_;
28 static int i = 0;
29 static int i = 0;
29 auto event = CatalogueController::make_event_ptr();
30 auto event = CatalogueController::make_event_ptr();
30 event->name = std::string("Event ") + std::to_string(i++);
31 event->name = std::string("Event ") + std::to_string(i++);
Show file before | Show file after | Hide comments
@@ -12,6 +12,8 qt5printsupport = dependency('qt5', modules : 'PrintSupport')
12 qt5Concurrent = dependency('qt5', modules : 'Concurrent')
12 qt5Concurrent = dependency('qt5', modules : 'Concurrent')
13 qt5test = dependency('qt5', modules : 'Test')
13 qt5test = dependency('qt5', modules : 'Test')
14
14
15 cpp_utils_dep = dependency('cpp_utils', fallback:['cpp_utils','cpp_utils_dep'])
16
15 moc = find_program('moc-qt5','moc')
17 moc = find_program('moc-qt5','moc')
16 rcc = find_program('rcc-qt5','rcc')
18 rcc = find_program('rcc-qt5','rcc')
17
19
General Comments 0
You need to be logged in to leave comments. Login now