##// END OF EJS Templates
Updated Meson build definitions...
jeandet -
r1410:143f4d9b5628
parent child
Show More
@@ -0,0 +1,5
1 [wrap-git]
2 directory = catalogicpp
3 url = https://github.com/jeandet/catalogicpp.git
4 revision = master
5
@@ -0,0 +1,5
1 [wrap-git]
2 directory = stduuid
3 url = https://github.com/jeandet/stduuid.git
4 revision = meson
5
@@ -23,7 +23,7
23 #include "ui_MainWindow.h"
23 #include "ui_MainWindow.h"
24
24
25 #include <Catalogue/CatalogueController.h>
25 #include <Catalogue/CatalogueController.h>
26 #include <Catalogue/CatalogueExplorer.h>
26 //#include <Catalogue/CatalogueExplorer.h>
27 #include <DataSource/DataSourceController.h>
27 #include <DataSource/DataSourceController.h>
28 #include <DataSource/DataSourceWidget.h>
28 #include <DataSource/DataSourceWidget.h>
29 #include <Settings/SqpSettingsDialog.h>
29 #include <Settings/SqpSettingsDialog.h>
@@ -1,1 +1,1
1 Subproject commit 0093c733b640e07ebeaf204c1ed1279db095aa9f
1 Subproject commit 24f31ec545d2e177fc2212ecdb457e01533b6fbb
@@ -1,54 +1,82
1
1
2 gui_moc_headers = [
2 gui_moc_headers = [
3 'include/DataSource/DataSourceWidget.h',
3 './include/Common/VisualizationDef.h',
4 'include/Settings/SqpSettingsDialog.h',
4 './include/Common/ColorUtils.h',
5 'include/Settings/SqpSettingsGeneralWidget.h',
5 './include/DragAndDrop/DragDropGuiController.h',
6 'include/SidePane/SqpSidePane.h',
6 './include/DragAndDrop/DragDropTabSwitcher.h',
7 'include/SqpApplication.h',
7 './include/DragAndDrop/DragDropScroller.h',
8 'include/DragAndDrop/DragDropScroller.h',
8 './include/Settings/SqpSettingsDialog.h',
9 'include/DragAndDrop/DragDropTabSwitcher.h',
9 './include/Settings/SqpSettingsGeneralWidget.h',
10 'include/TimeWidget/TimeWidget.h',
10 './include/DataSource/DataSourceTreeWidgetHelper.h',
11 'include/Variable/VariableInspectorWidget.h',
11 './include/DataSource/DataSourceTreeWidget.h',
12 'include/Variable/RenameVariableDialog.h',
12 './include/DataSource/DataSourceTreeWidgetItem.h',
13 'include/Visualization/qcustomplot.h',
13 './include/DataSource/DataSourceWidget.h',
14 'include/Visualization/VisualizationGraphWidget.h',
14 './include/Catalogue2/repositoriestreeview.h',
15 'include/Visualization/VisualizationTabWidget.h',
15 './include/Catalogue2/browser.h',
16 'include/Visualization/VisualizationWidget.h',
16 './include/Catalogue2/eventeditor.h',
17 'include/Visualization/VisualizationZoneWidget.h',
17 './include/Catalogue2/eventsmodel.h',
18 'include/Visualization/VisualizationDragDropContainer.h',
18 './include/Catalogue2/eventstreeview.h',
19 'include/Visualization/VisualizationDragWidget.h',
19 './include/Catalogue2/repositoriesmodel.h',
20 'include/Visualization/ColorScaleEditor.h',
20 './include/TimeWidget/TimeWidget.h',
21 'include/Visualization/VisualizationSelectionZoneItem.h',
21 './include/SqpApplication.h',
22 'include/Actions/SelectionZoneAction.h',
22 './include/SidePane/SqpSidePane.h',
23 'include/Visualization/VisualizationMultiZoneSelectionDialog.h',
23 './include/Variable/RenameVariableDialog.h',
24 'include/Catalogue/CatalogueExplorer.h',
24 './include/Variable/VariableInspectorWidget.h',
25 'include/Catalogue/CatalogueEventsWidget.h',
25 './include/Variable/VariableInspectorTableView.h',
26 'include/Catalogue/CatalogueSideBarWidget.h',
26 './include/Variable/VariableMenuHeaderWidget.h',
27 'include/Catalogue/CatalogueInspectorWidget.h',
27 './include/Visualization/VisualizationDragWidget.h',
28 'include/Catalogue/CatalogueEventsModel.h',
28 './include/Visualization/VisualizationZoneWidget.h',
29 'include/Catalogue/CatalogueTreeModel.h',
29 './include/Visualization/operations/GenerateVariableMenuOperation.h',
30 'include/Actions/FilteringAction.h'
30 './include/Visualization/operations/RescaleAxeOperation.h',
31 './include/Visualization/operations/RemoveVariableOperation.h',
32 './include/Visualization/operations/MenuBuilder.h',
33 './include/Visualization/operations/FindVariableOperation.h',
34 './include/Visualization/VisualizationDefs.h',
35 './include/Visualization/IVisualizationWidgetVisitor.h',
36 './include/Visualization/SqpColorScale.h',
37 './include/Visualization/VisualizationGraphRenderingDelegate.h',
38 './include/Visualization/VisualizationGraphWidget.h',
39 './include/Visualization/MacScrollBarStyle.h',
40 './include/Visualization/IVisualizationWidget.h',
41 './include/Visualization/qcustomplot.h',
42 './include/Visualization/IGraphSynchronizer.h',
43 './include/Visualization/QCPColorMapIterator.h',
44 './include/Visualization/VisualizationActionManager.h',
45 './include/Visualization/VisualizationTabWidget.h',
46 './include/Visualization/IVariableContainer.h',
47 './include/Visualization/AxisRenderingUtils.h',
48 './include/Visualization/VisualizationMultiZoneSelectionDialog.h',
49 './include/Visualization/VisualizationCursorItem.h',
50 './include/Visualization/VisualizationWidget.h',
51 './include/Visualization/PlottablesRenderingUtils.h',
52 './include/Visualization/VisualizationSelectionZoneManager.h',
53 './include/Visualization/QCustomPlotSynchronizer.h',
54 './include/Visualization/VisualizationSelectionZoneItem.h',
55 './include/Visualization/VisualizationDragDropContainer.h',
56 './include/Visualization/ColorScaleEditor.h',
57 './include/Visualization/VisualizationGraphHelper.h',
58 './include/Actions/ActionsGuiController.h',
59 './include/Actions/FilteringAction.h',
60 './include/Actions/SelectionZoneAction.h'
31 ]
61 ]
32
62
33 gui_ui_files = [
63 gui_ui_files = [
34 'ui/DataSource/DataSourceWidget.ui',
64 './ui/Settings/SqpSettingsGeneralWidget.ui',
35 'ui/Settings/SqpSettingsDialog.ui',
65 './ui/Settings/SqpSettingsDialog.ui',
36 'ui/Settings/SqpSettingsGeneralWidget.ui',
66 './ui/DataSource/DataSourceWidget.ui',
37 'ui/SidePane/SqpSidePane.ui',
67 './ui/Catalogue2/browser.ui',
38 'ui/TimeWidget/TimeWidget.ui',
68 './ui/Catalogue2/eventeditor.ui',
39 'ui/Variable/VariableInspectorWidget.ui',
69 './ui/TimeWidget/TimeWidget.ui',
40 'ui/Variable/RenameVariableDialog.ui',
70 './ui/SidePane/SqpSidePane.ui',
41 'ui/Variable/VariableMenuHeaderWidget.ui',
71 './ui/Variable/RenameVariableDialog.ui',
42 'ui/Visualization/VisualizationGraphWidget.ui',
72 './ui/Variable/VariableInspectorWidget.ui',
43 'ui/Visualization/VisualizationTabWidget.ui',
73 './ui/Variable/VariableMenuHeaderWidget.ui',
44 'ui/Visualization/VisualizationWidget.ui',
74 './ui/Visualization/ColorScaleEditor.ui',
45 'ui/Visualization/VisualizationZoneWidget.ui',
75 './ui/Visualization/VisualizationZoneWidget.ui',
46 'ui/Visualization/ColorScaleEditor.ui',
76 './ui/Visualization/VisualizationMultiZoneSelectionDialog.ui',
47 'ui/Visualization/VisualizationMultiZoneSelectionDialog.ui',
77 './ui/Visualization/VisualizationGraphWidget.ui',
48 'ui/Catalogue/CatalogueExplorer.ui',
78 './ui/Visualization/VisualizationWidget.ui',
49 'ui/Catalogue/CatalogueEventsWidget.ui',
79 './ui/Visualization/VisualizationTabWidget.ui'
50 'ui/Catalogue/CatalogueSideBarWidget.ui',
51 'ui/Catalogue/CatalogueInspectorWidget.ui'
52 ]
80 ]
53
81
54 gui_qresources = ['resources/sqpguiresources.qrc']
82 gui_qresources = ['resources/sqpguiresources.qrc']
@@ -67,64 +95,59 gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
67 ui_files : gui_ui_files)
95 ui_files : gui_ui_files)
68
96
69 gui_sources = [
97 gui_sources = [
70 'src/SqpApplication.cpp',
98 './src/Common/ColorUtils.cpp',
71 'src/DragAndDrop/DragDropGuiController.cpp',
99 './src/Common/VisualizationDef.cpp',
72 'src/DragAndDrop/DragDropScroller.cpp',
100 './src/SqpApplication.cpp',
73 'src/DragAndDrop/DragDropTabSwitcher.cpp',
101 './src/DragAndDrop/DragDropTabSwitcher.cpp',
74 'src/Common/ColorUtils.cpp',
102 './src/DragAndDrop/DragDropScroller.cpp',
75 'src/Common/VisualizationDef.cpp',
103 './src/DragAndDrop/DragDropGuiController.cpp',
76 'src/DataSource/DataSourceTreeWidgetItem.cpp',
104 './src/Settings/SqpSettingsGeneralWidget.cpp',
77 'src/DataSource/DataSourceTreeWidgetHelper.cpp',
105 './src/Settings/SqpSettingsDialog.cpp',
78 'src/DataSource/DataSourceWidget.cpp',
106 './src/DataSource/DataSourceTreeWidgetItem.cpp',
79 'src/DataSource/DataSourceTreeWidget.cpp',
107 './src/DataSource/DataSourceTreeWidgetHelper.cpp',
80 'src/Settings/SqpSettingsDialog.cpp',
108 './src/DataSource/DataSourceWidget.cpp',
81 'src/Settings/SqpSettingsGeneralWidget.cpp',
109 './src/DataSource/DataSourceTreeWidget.cpp',
82 'src/SidePane/SqpSidePane.cpp',
110 './src/Catalogue2/eventstreeview.cpp',
83 'src/TimeWidget/TimeWidget.cpp',
111 './src/Catalogue2/eventeditor.cpp',
84 'src/Variable/VariableInspectorWidget.cpp',
112 './src/Catalogue2/repositoriestreeview.cpp',
85 'src/Variable/VariableInspectorTableView.cpp',
113 './src/Catalogue2/browser.cpp',
86 'src/Variable/VariableMenuHeaderWidget.cpp',
114 './src/Catalogue2/eventsmodel.cpp',
87 'src/Variable/RenameVariableDialog.cpp',
115 './src/Catalogue2/repositoriesmodel.cpp',
88 'src/Visualization/VisualizationGraphHelper.cpp',
116 './src/TimeWidget/TimeWidget.cpp',
89 'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
117 './src/SidePane/SqpSidePane.cpp',
90 'src/Visualization/VisualizationGraphWidget.cpp',
118 './src/Variable/VariableInspectorTableView.cpp',
91 'src/Visualization/VisualizationTabWidget.cpp',
119 './src/Variable/VariableInspectorWidget.cpp',
92 'src/Visualization/VisualizationWidget.cpp',
120 './src/Variable/RenameVariableDialog.cpp',
93 'src/Visualization/VisualizationZoneWidget.cpp',
121 './src/Variable/VariableMenuHeaderWidget.cpp',
94 'src/Visualization/qcustomplot.cpp',
122 './src/Visualization/VisualizationGraphWidget.cpp',
95 'src/Visualization/QCustomPlotSynchronizer.cpp',
123 './src/Visualization/PlottablesRenderingUtils.cpp',
96 'src/Visualization/operations/FindVariableOperation.cpp',
124 './src/Visualization/AxisRenderingUtils.cpp',
97 'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
125 './src/Visualization/VisualizationWidget.cpp',
98 'src/Visualization/operations/MenuBuilder.cpp',
126 './src/Visualization/qcustomplot.cpp',
99 'src/Visualization/operations/RemoveVariableOperation.cpp',
127 './src/Visualization/VisualizationDragWidget.cpp',
100 'src/Visualization/operations/RescaleAxeOperation.cpp',
128 './src/Visualization/VisualizationActionManager.cpp',
101 'src/Visualization/VisualizationDragDropContainer.cpp',
129 './src/Visualization/MacScrollBarStyle.cpp',
102 'src/Visualization/VisualizationDragWidget.cpp',
130 './src/Visualization/VisualizationSelectionZoneManager.cpp',
103 'src/Visualization/AxisRenderingUtils.cpp',
131 './src/Visualization/operations/FindVariableOperation.cpp',
104 'src/Visualization/PlottablesRenderingUtils.cpp',
132 './src/Visualization/operations/RescaleAxeOperation.cpp',
105 'src/Visualization/MacScrollBarStyle.cpp',
133 './src/Visualization/operations/MenuBuilder.cpp',
106 'src/Visualization/VisualizationCursorItem.cpp',
134 './src/Visualization/operations/GenerateVariableMenuOperation.cpp',
107 'src/Visualization/ColorScaleEditor.cpp',
135 './src/Visualization/operations/RemoveVariableOperation.cpp',
108 'src/Visualization/SqpColorScale.cpp',
136 './src/Visualization/VisualizationSelectionZoneItem.cpp',
109 'src/Visualization/QCPColorMapIterator.cpp',
137 './src/Visualization/VisualizationCursorItem.cpp',
110 'src/Visualization/VisualizationSelectionZoneItem.cpp',
138 './src/Visualization/QCPColorMapIterator.cpp',
111 'src/Visualization/VisualizationSelectionZoneManager.cpp',
139 './src/Visualization/QCustomPlotSynchronizer.cpp',
112 'src/Actions/SelectionZoneAction.cpp',
140 './src/Visualization/ColorScaleEditor.cpp',
113 'src/Actions/ActionsGuiController.cpp',
141 './src/Visualization/VisualizationMultiZoneSelectionDialog.cpp',
114 'src/Actions/FilteringAction.cpp',
142 './src/Visualization/VisualizationTabWidget.cpp',
115 'src/Visualization/VisualizationActionManager.cpp',
143 './src/Visualization/VisualizationGraphHelper.cpp',
116 'src/Visualization/VisualizationMultiZoneSelectionDialog.cpp',
144 './src/Visualization/VisualizationGraphRenderingDelegate.cpp',
117 'src/Catalogue/CatalogueExplorer.cpp',
145 './src/Visualization/VisualizationDragDropContainer.cpp',
118 'src/Catalogue/CatalogueEventsWidget.cpp',
146 './src/Visualization/VisualizationZoneWidget.cpp',
119 'src/Catalogue/CatalogueSideBarWidget.cpp',
147 './src/Visualization/SqpColorScale.cpp',
120 'src/Catalogue/CatalogueInspectorWidget.cpp',
148 './src/Actions/FilteringAction.cpp',
121 'src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp',
149 './src/Actions/SelectionZoneAction.cpp',
122 'src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp',
150 './src/Actions/ActionsGuiController.cpp',
123 'src/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.cpp',
124 'src/Catalogue/CatalogueEventsModel.cpp',
125 'src/Catalogue/CatalogueExplorerHelper.cpp',
126 'src/Catalogue/CatalogueActionManager.cpp',
127 'src/Catalogue/CatalogueTreeModel.cpp'
128 ]
151 ]
129
152
130 gui_inc = include_directories(['include', 'include/Visualization'])
153 gui_inc = include_directories(['include', 'include/Visualization'])
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (502 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (615 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now