##// END OF EJS Templates
Meson fixes:...
jeandet -
r704:58b60dbc1b8b
parent child
Show More
@@ -1,63 +1,62
1
1
2 core_moc_headers = [
2 core_moc_headers = [
3 'include/Data/IDataProvider.h',
3 'include/Data/IDataProvider.h',
4 'include/Data/DataSeriesMergeHelper.h',
5 'include/DataSource/DataSourceController.h',
4 'include/DataSource/DataSourceController.h',
6 'include/DataSource/DataSourceItemAction.h',
5 'include/DataSource/DataSourceItemAction.h',
7 'include/Network/NetworkController.h',
6 'include/Network/NetworkController.h',
8 'include/Time/TimeController.h',
7 'include/Time/TimeController.h',
9 'include/Variable/Variable.h',
8 'include/Variable/Variable.h',
10 'include/Variable/VariableCacheController.h',
9 'include/Variable/VariableCacheController.h',
11 'include/Variable/VariableController.h',
10 'include/Variable/VariableController.h',
12 'include/Variable/VariableAcquisitionWorker.h',
11 'include/Variable/VariableAcquisitionWorker.h',
13 'include/Variable/VariableCacheStrategy.h',
12 'include/Variable/VariableCacheStrategy.h',
14 'include/Variable/VariableSynchronizationGroup.h',
13 'include/Variable/VariableSynchronizationGroup.h',
15 'include/Variable/VariableModel.h',
14 'include/Variable/VariableModel.h',
16 'include/Visualization/VisualizationController.h'
15 'include/Visualization/VisualizationController.h'
17 ]
16 ]
18
17
19
18
20 core_moc_files = qt5.preprocess(moc_headers : core_moc_headers)
19 core_moc_files = qt5.preprocess(moc_headers : core_moc_headers)
21
20
22 core_sources = [
21 core_sources = [
23 'src/Common/DateUtils.cpp',
22 'src/Common/DateUtils.cpp',
24 'src/Data/ScalarSeries.cpp',
23 'src/Data/ScalarSeries.cpp',
25 'src/Data/DataSeriesIterator.cpp',
24 'src/Data/DataSeriesIterator.cpp',
26 'src/Data/ArrayDataIterator.cpp',
25 'src/Data/ArrayDataIterator.cpp',
27 'src/Data/VectorSeries.cpp',
26 'src/Data/VectorSeries.cpp',
28 'src/DataSource/DataSourceController.cpp',
27 'src/DataSource/DataSourceController.cpp',
29 'src/DataSource/DataSourceItem.cpp',
28 'src/DataSource/DataSourceItem.cpp',
30 'src/DataSource/DataSourceItemAction.cpp',
29 'src/DataSource/DataSourceItemAction.cpp',
31 'src/Network/NetworkController.cpp',
30 'src/Network/NetworkController.cpp',
32 'src/Plugin/PluginManager.cpp',
31 'src/Plugin/PluginManager.cpp',
33 'src/Settings/SqpSettingsDefs.cpp',
32 'src/Settings/SqpSettingsDefs.cpp',
34 'src/Time/TimeController.cpp',
33 'src/Time/TimeController.cpp',
35 'src/Variable/Variable.cpp',
34 'src/Variable/Variable.cpp',
36 'src/Variable/VariableCacheController.cpp',
35 'src/Variable/VariableCacheController.cpp',
37 'src/Variable/VariableController.cpp',
36 'src/Variable/VariableController.cpp',
38 'src/Variable/VariableAcquisitionWorker.cpp',
37 'src/Variable/VariableAcquisitionWorker.cpp',
39 'src/Variable/VariableCacheStrategy.cpp',
38 'src/Variable/VariableCacheStrategy.cpp',
40 'src/Variable/VariableSynchronizationGroup.cpp',
39 'src/Variable/VariableSynchronizationGroup.cpp',
41 'src/Variable/VariableModel.cpp',
40 'src/Variable/VariableModel.cpp',
42 'src/Visualization/VisualizationController.cpp'
41 'src/Visualization/VisualizationController.cpp'
43 ]
42 ]
44
43
45 core_inc = include_directories(['include', '../plugin/include'])
44 core_inc = include_directories(['include', '../plugin/include'])
46
45
47 sciqlop_core_lib = library('sciqlopcore',
46 sciqlop_core_lib = library('sciqlopcore',
48 core_sources,
47 core_sources,
49 core_moc_files,
48 core_moc_files,
50 cpp_args : '-DCORE_LIB',
49 cpp_args : '-DCORE_LIB',
51 include_directories : core_inc,
50 include_directories : core_inc,
52 dependencies : [qt5core, qt5network],
51 dependencies : [qt5core, qt5network],
53 install : true
52 install : true
54 )
53 )
55
54
56
55
57 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
56 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
58 include_directories : core_inc,
57 include_directories : core_inc,
59 dependencies : [qt5core, qt5network])
58 dependencies : [qt5core, qt5network])
60
59
61
60
62 subdir('tests')
61 subdir('tests')
63
62
@@ -1,78 +1,78
1
1
2 gui_moc_headers = [
2 gui_moc_headers = [
3 'include/DataSource/DataSourceWidget.h',
3 'include/DataSource/DataSourceWidget.h',
4 'include/Settings/SqpSettingsDialog.h',
4 'include/Settings/SqpSettingsDialog.h',
5 'include/Settings/SqpSettingsGeneralWidget.h',
5 'include/Settings/SqpSettingsGeneralWidget.h',
6 'include/SidePane/SqpSidePane.h',
6 'include/SidePane/SqpSidePane.h',
7 'include/SqpApplication.h',
7 'include/SqpApplication.h',
8 'include/TimeWidget/TimeWidget.h',
8 'include/TimeWidget/TimeWidget.h',
9 'include/Variable/VariableInspectorWidget.h',
9 'include/Variable/VariableInspectorWidget.h',
10 'include/Variable/RenameVariableDialog.h',
10 'include/Variable/RenameVariableDialog.h',
11 'include/Visualization/qcustomplot.h',
11 'include/Visualization/qcustomplot.h',
12 'include/Visualization/VisualizationGraphWidget.h',
12 'include/Visualization/VisualizationGraphWidget.h',
13 'include/Visualization/VisualizationTabWidget.h',
13 'include/Visualization/VisualizationTabWidget.h',
14 'include/Visualization/VisualizationWidget.h',
14 'include/Visualization/VisualizationWidget.h',
15 'include/Visualization/VisualizationZoneWidget.h'
15 'include/Visualization/VisualizationZoneWidget.h'
16 ]
16 ]
17
17
18 gui_ui_files = [
18 gui_ui_files = [
19 'ui/DataSource/DataSourceWidget.ui',
19 'ui/DataSource/DataSourceWidget.ui',
20 'ui/Settings/SqpSettingsDialog.ui',
20 'ui/Settings/SqpSettingsDialog.ui',
21 'ui/Settings/SqpSettingsGeneralWidget.ui',
21 'ui/Settings/SqpSettingsGeneralWidget.ui',
22 'ui/SidePane/SqpSidePane.ui',
22 'ui/SidePane/SqpSidePane.ui',
23 'ui/TimeWidget/TimeWidget.ui',
23 'ui/TimeWidget/TimeWidget.ui',
24 'ui/Variable/VariableInspectorWidget.ui',
24 'ui/Variable/VariableInspectorWidget.ui',
25 'ui/Variable/VariableMenuHeaderWidget.ui',
25 'ui/Variable/VariableMenuHeaderWidget.ui',
26 'ui/Variable/RenameVariableDialog.ui',
26 'ui/Variable/RenameVariableDialog.ui',
27 'ui/Visualization/VisualizationGraphWidget.ui',
27 'ui/Visualization/VisualizationGraphWidget.ui',
28 'ui/Visualization/VisualizationTabWidget.ui',
28 'ui/Visualization/VisualizationTabWidget.ui',
29 'ui/Visualization/VisualizationWidget.ui',
29 'ui/Visualization/VisualizationWidget.ui',
30 'ui/Visualization/VisualizationZoneWidget.ui'
30 'ui/Visualization/VisualizationZoneWidget.ui'
31 ]
31 ]
32
32
33 gui_qresources = ['resources/sqpguiresources.qrc']
33 gui_qresources = ['resources/sqpguiresources.qrc']
34
34
35 gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
35 gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
36 ui_files : gui_ui_files,
36 ui_files : gui_ui_files,
37 qresources : gui_qresources)
37 qresources : gui_qresources)
38
38
39 gui_sources = [
39 gui_sources = [
40 'src/SqpApplication.cpp',
40 'src/SqpApplication.cpp',
41 'src/Common/ColorUtils.cpp',
41 'src/Common/ColorUtils.cpp',
42 'src/DataSource/DataSourceTreeWidgetItem.cpp',
42 'src/DataSource/DataSourceTreeWidgetItem.cpp',
43 'src/DataSource/DataSourceTreeWidgetHelper.cpp',
43 'src/DataSource/DataSourceTreeWidgetHelper.cpp',
44 'src/DataSource/DataSourceWidget.cpp',
44 'src/DataSource/DataSourceWidget.cpp',
45 'src/Settings/SqpSettingsDialog.cpp',
45 'src/Settings/SqpSettingsDialog.cpp',
46 'src/Settings/SqpSettingsGeneralWidget.cpp',
46 'src/Settings/SqpSettingsGeneralWidget.cpp',
47 'src/SidePane/SqpSidePane.cpp',
47 'src/SidePane/SqpSidePane.cpp',
48 'src/TimeWidget/TimeWidget.cpp',
48 'src/TimeWidget/TimeWidget.cpp',
49 'src/Variable/VariableInspectorWidget.cpp',
49 'src/Variable/VariableInspectorWidget.cpp',
50 'src/Variable/VariableMenuHeaderWidget.cpp',
50 'src/Variable/VariableMenuHeaderWidget.cpp',
51 'src/Variable/RenamevariableDialog.cpp',
51 'src/Variable/RenameVariableDialog.cpp',
52 'src/Visualization/VisualizationGraphHelper.cpp',
52 'src/Visualization/VisualizationGraphHelper.cpp',
53 'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
53 'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
54 'src/Visualization/VisualizationGraphWidget.cpp',
54 'src/Visualization/VisualizationGraphWidget.cpp',
55 'src/Visualization/VisualizationTabWidget.cpp',
55 'src/Visualization/VisualizationTabWidget.cpp',
56 'src/Visualization/VisualizationWidget.cpp',
56 'src/Visualization/VisualizationWidget.cpp',
57 'src/Visualization/VisualizationZoneWidget.cpp',
57 'src/Visualization/VisualizationZoneWidget.cpp',
58 'src/Visualization/qcustomplot.cpp',
58 'src/Visualization/qcustomplot.cpp',
59 'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
59 'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
60 'src/Visualization/operations/MenuBuilder.cpp',
60 'src/Visualization/operations/MenuBuilder.cpp',
61 'src/Visualization/operations/RemoveVariableOperation.cpp',
61 'src/Visualization/operations/RemoveVariableOperation.cpp',
62 'src/Visualization/operations/RescaleAxeOperation.cpp'
62 'src/Visualization/operations/RescaleAxeOperation.cpp'
63 ]
63 ]
64
64
65 gui_inc = include_directories(['include'])
65 gui_inc = include_directories(['include'])
66
66
67 sciqlop_gui_lib = library('sciqlopgui',
67 sciqlop_gui_lib = library('sciqlopgui',
68 gui_sources,
68 gui_sources,
69 gui_moc_files,
69 gui_moc_files,
70 include_directories : [gui_inc],
70 include_directories : [gui_inc],
71 dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core],
71 dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core],
72 install : true
72 install : true
73 )
73 )
74
74
75 sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,
75 sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,
76 include_directories : gui_inc,
76 include_directories : gui_inc,
77 dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core])
77 dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core])
78
78
General Comments 0
You need to be logged in to leave comments. Login now