##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » SciQLOPCore
RSS
Updated meson build files...
jeandet -
r35:35ef46382be5
parent child
Show More
Show file before | Show file after | Hide comments
@@ -73,9 +73,7 FILE (GLOB_RECURSE core_SRCS
73 ./include/Data/ScalarSeries.h
73 ./include/Data/ScalarSeries.h
74 ./include/Data/DataSeriesMergeHelper.h
74 ./include/Data/DataSeriesMergeHelper.h
75 ./include/Data/DataSeries.h
75 ./include/Data/DataSeries.h
76 #./include/Data/AcquisitionDataPacket.h
77 ./include/Data/DataSeriesType.h
76 ./include/Data/DataSeriesType.h
78 #./include/Data/AcquisitionRequest.h
79 ./include/Data/SqpIterator.h
77 ./include/Data/SqpIterator.h
80 ./include/Data/ArrayData.h
78 ./include/Data/ArrayData.h
81 ./include/Data/DataSeriesIterator.h
79 ./include/Data/DataSeriesIterator.h
Show file before | Show file after | Hide comments
@@ -2,6 +2,7
2 #define SCIQLOP_VARIABLEMODEL2_H
2 #define SCIQLOP_VARIABLEMODEL2_H
3
3
4 #include "CoreGlobal.h"
4 #include "CoreGlobal.h"
5 #include <QUuid>
5
6
6 #include <Data/DateTimeRange.h>
7 #include <Data/DateTimeRange.h>
7
8
Show file before | Show file after | Hide comments
@@ -1,57 +1,103
1
1
2 qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep'])
2 qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep'])
3 libcatalogs_dep = dependency('libcatalogs', required : true, fallback:['libcatalogs','libcatalogs_dep'])
3 libcatalogs_dep = dependency('libcatalogs', required : true, fallback:['libcatalogs','libcatalogs_dep'])
4 pybind11_dep = dependency('pybind11', required : true, fallback:['pybind11','pybind11_dep'])
4
5
5
6
6 core_moc_headers = [
7 core_moc_headers = [
7 'include/Catalogue/CatalogueController.h',
8 'include/Network/Response.h',
8 'include/Common/SignalWaiter.h',
9 'include/Network/NetworkController.h',
9 'include/Data/IDataProvider.h',
10 'include/Network/Downloader.h',
10 'include/DataSource/DataSourceController.h',
11 'include/DataSource/DataSourceItem.h',
11 'include/DataSource/DataSourceItemAction.h',
12 'include/DataSource/DataSourceItemMergeHelper.h',
12 'include/Network/NetworkController.h',
13 'include/DataSource/DataSourceItemAction.h',
13 'include/Time/TimeController.h',
14 'include/DataSource/DataSourceController.h',
14 'include/Variable/Variable.h',
15 'include/Common/spimpl.h',
15 'include/Variable/VariableCacheController.h',
16 'include/Common/StringUtils.h',
16 'include/Variable/VariableController.h',
17 'include/Common/SignalWaiter.h',
17 'include/Variable/VariableAcquisitionWorker.h',
18 'include/Common/MimeTypesDef.h',
18 'include/Variable/VariableSynchronizationGroup.h',
19 'include/Common/SortUtils.h',
19 'include/Variable/VariableModel.h',
20 'include/Common/containers.h',
20 'include/Visualization/VisualizationController.h'
21 'include/Common/debug.h',
21 ]
22 'include/Common/DateUtils.h',
22
23 'include/Common/deprecate.h',
23
24 'include/Common/MetaTypes.h',
24 core_moc_files = qt5.preprocess(moc_headers : core_moc_headers)
25 'include/Common/Numeric.h',
26 'include/Time/TimeController.h',
27 'include/Data/ArrayDataIterator.h',
28 'include/Data/ScalarSeries.h',
29 'include/Data/DataSeriesUtils.h',
30 'include/Data/DataProviderParameters.h',
31 'include/Data/DataSeriesMergeHelper.h',
32 'include/Data/ArrayData.h',
33 'include/Data/DateTimeRangeHelper.h',
34 'include/Data/VectorSeries.h',
35 'include/Data/DataSeries.h',
36 'include/Data/SpectrogramSeries.h',
37 'include/Data/SqpIterator.h',
38 'include/Data/IDataProvider.h',
39 'include/Data/DataSeriesIterator.h',
40 'include/Data/DataSeriesType.h',
41 'include/Data/Unit.h',
42 'include/Data/IDataSeries.h',
43 'include/Data/OptionalAxis.h',
44 'include/Data/DateTimeRange.h',
45 'include/Data/VariableRequest.h',
46 'include/PluginManager/PluginManager.h',
47 'include/Catalogue/CatalogueController.h',
48 'include/Visualization/VisualizationController.h',
49 'include/Settings/ISqpSettingsBindable.h',
50 'include/Settings/SqpSettingsDefs.h',
51 'include/Variable/ProportionalCacheStrategy.h',
52 'include/Variable/VariableCacheStrategyFactory.h',
53 'include/Variable/VariableSynchronizationGroup2.h',
54 'include/Variable/VariableController2.h',
55 'include/Variable/VariableModel2.h',
56 'include/Variable/SingleThresholdCacheStrategy.h',
57 'include/Variable/private/VCTransaction.h',
58 'include/Variable/Variable.h',
59 'include/Variable/VariableCacheStrategy.h',
60 'include/CoreGlobal.h',
61 'include/Plugin/IPlugin.h',
62 'include/Version.h']
63
64
65 core_moc_sources = ['src/Network/Downloader.cpp']
66
67
68 core_moc_files = qt5.preprocess(moc_headers : core_moc_headers, moc_sources: core_moc_sources)
25
69
26 core_sources = [
70 core_sources = [
27 'src/Common/DateUtils.cpp',
71 'src/Network/NetworkController.cpp',
28 'src/Common/SignalWaiter.cpp',
72 'src/Network/Downloader.cpp',
29 'src/Common/StringUtils.cpp',
73 'src/DataSource/DataSourceItem.cpp',
30 'src/Common/MimeTypesDef.cpp',
74 'src/DataSource/DataSourceController.cpp',
31 'src/Catalogue/CatalogueController.cpp',
75 'src/DataSource/DataSourceItemMergeHelper.cpp',
32 'src/Data/ScalarSeries.cpp',
76 'src/DataSource/DataSourceItemAction.cpp',
33 'src/Data/SpectrogramSeries.cpp',
77 'src/Common/MimeTypesDef.cpp',
34 'src/Data/DataSeriesIterator.cpp',
78 'src/Common/SignalWaiter.cpp',
35 'src/Data/ArrayDataIterator.cpp',
79 'src/Common/StringUtils.cpp',
36 'src/Data/VectorSeries.cpp',
80 'src/Common/DateUtils.cpp',
37 'src/Data/OptionalAxis.cpp',
81 'src/Time/TimeController.cpp',
38 'src/Data/DataSeriesUtils.cpp',
82 'src/Data/DataSeriesUtils.cpp',
39 'src/DataSource/DataSourceController.cpp',
83 'src/Data/VectorSeries.cpp',
40 'src/DataSource/DataSourceItem.cpp',
84 'src/Data/DataSeriesIterator.cpp',
41 'src/DataSource/DataSourceItemAction.cpp',
85 'src/Data/ScalarSeries.cpp',
42 'src/DataSource/DataSourceItemMergeHelper.cpp',
86 'src/Data/SpectrogramSeries.cpp',
43 'src/Network/NetworkController.cpp',
87 'src/Data/OptionalAxis.cpp',
44 'src/PluginManager/PluginManager.cpp',
88 'src/Data/ArrayDataIterator.cpp',
45 'src/Settings/SqpSettingsDefs.cpp',
89 #'src/pybind11_wrappers/QtWrappers.cpp',
46 'src/Time/TimeController.cpp',
90 #'src/pybind11_wrappers/CoreWrappers.cpp',
47 'src/Variable/Variable.cpp',
91 'src/PluginManager/PluginManager.cpp',
48 'src/Variable/VariableCacheController.cpp',
92 'src/Catalogue/CatalogueController.cpp',
49 'src/Variable/VariableController.cpp',
93 'src/Visualization/VisualizationController.cpp',
50 'src/Variable/VariableAcquisitionWorker.cpp',
94 'src/Settings/SqpSettingsDefs.cpp',
51 'src/Variable/VariableSynchronizationGroup.cpp',
95 'src/Variable/Variable.cpp',
52 'src/Variable/VariableModel.cpp',
96 'src/Variable/VariableSynchronizationGroup2.cpp',
53 'src/Visualization/VisualizationController.cpp'
97 'src/Variable/VariableController2.cpp',
54 ]
98 'src/Variable/VariableModel2.cpp',
99 'src/Version.cpp']
100
55
101
56 core_inc = include_directories(['include', 'include/Plugin'])
102 core_inc = include_directories(['include', 'include/Plugin'])
57
103
@@ -60,14 +106,14 sciqlop_core_lib = library('sciqlopcore',
60 core_moc_files,
106 core_moc_files,
61 cpp_args : '-DCORE_LIB',
107 cpp_args : '-DCORE_LIB',
62 include_directories : core_inc,
108 include_directories : core_inc,
63 dependencies : [qt5core, qt5network, libcatalogs_dep],
109 dependencies : [qt5core, qt5network, libcatalogs_dep, pybind11_dep],
64 install : true
110 install : true
65 )
111 )
66
112
67
113
68 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
114 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
69 include_directories : core_inc,
115 include_directories : core_inc,
70 dependencies : [qt5core, qt5network, libcatalogs_dep])
116 dependencies : [qt5core, qt5network, libcatalogs_dep, pybind11_dep])
71
117
72
118
73
119
Show file before | Show file after | Hide comments
@@ -1,36 +1,135
1 TestUtils = library('TestUtils', 'TestUtils/TestProviders.h', 'TestUtils/TestProviders.cpp',
2 dependencies : [sciqlop_core, qt5test]
3 )
1
4
2
5
3 tests = [
6 TestUtils_dep = declare_dependency(link_with : TestUtils,
4 [['Common/TestStringUtils.cpp'],'test_string_utils','StringUtils test'],
7 dependencies : [sciqlop_core, qt5test])
5 [['Data/TestScalarSeries.cpp'],'test_scalar','ScalarSeries test'],
8
6 [['Data/TestSpectrogramSeries.cpp'],'test_spectrogram','SpectrogramSeries test'],
9
7 [['Data/TestVectorSeries.cpp'],'test_vector','VectorSeries test'],
10 DataSeriesTestsUtils = library('DataSeriesTestsUtils', 'Data/DataSeriesBuilders.h', 'Data/DataSeriesBuilders.cpp',
8 [['Data/TestOneDimArrayData.cpp'],'test_1d','One Dim Array test'],
11 'Data/DataSeriesTestsUtils.h',
9 [['Data/TestOptionalAxis.cpp'],'test_optional_axis','OptionalAxis test'],
12 'Data/DataSeriesTestsUtils.cpp',
10 [['Data/TestTwoDimArrayData.cpp'],'test_2d','Two Dim Array test'],
13 dependencies : [sciqlop_core, qt5test]
11 [['Data/TestDataSeriesUtils.cpp'],'test_dataseries_util','Data series utils test'],
14 )
12 [['DataSource/TestDataSourceController.cpp'],'test_data_source','DataSourceController test'],
15
13 [['DataSource/TestDataSourceItem.cpp'],'test_data_source_item','DataSourceItem test'],
14 [['Variable/TestVariableCacheController.cpp'],'test_variable_cache','VariableCacheController test'],
15 [['Variable/TestVariable.cpp'],'test_variable','Variable test'],
16 [['Variable/TestVariableSync.cpp'],'test_variable_sync','Variable synchronization test']
17 ]
18
16
19 amdatest_sources = [
17 DataSeriesTestsUtils_dep = declare_dependency(link_with : DataSeriesTestsUtils,
20 'Data/DataSeriesBuilders.h',
18 dependencies : [sciqlop_core, qt5test])
21 'Data/DataSeriesBuilders.cpp',
19
22 'Data/DataSeriesTestsUtils.h',
20
23 'Data/DataSeriesTestsUtils.cpp',
21
24 'DataSource/DataSourceItemBuilder.h',
22 tests = [
25 'DataSource/DataSourceItemBuilder.cpp'
23 {
24 'name':'TestStringUtils',
25 'sources': ['Common/TestStringUtils.cpp'],
26 'deps': [sciqlop_core, qt5test]
27 },
28 {
29 'name':'TestContainers',
30 'sources': ['Common/TestContainers.cpp'],
31 'deps': [sciqlop_core, qt5test]
32 },
33 {
34 'name':'TestSyncGroup',
35 'sources': ['Variable/TestSyncGroup.cpp'],
36 'deps': [sciqlop_core, qt5test]
37 },
38 {
39 'name':'TestDateTimeRange',
40 'sources': ['Data/TestDateTimeRange.cpp'],
41 'deps': [sciqlop_core, qt5test]
42 },
43 {
44 'name':'TestDataSeriesUtils',
45 'sources': ['Data/TestDataSeriesUtils.cpp'],
46 'deps': [sciqlop_core, qt5test]
47 },
48 {
49 'name':'TestOptionalAxis',
50 'sources': ['Data/TestOptionalAxis.cpp'],
51 'deps': [sciqlop_core, qt5test]
52 },
53 {
54 'name':'TestSpectrogramSeries',
55 'sources': [
56 'Data/TestSpectrogramSeries.cpp',
57 ],
58 'deps': [sciqlop_core, qt5test, DataSeriesTestsUtils_dep]
59 },
60 {
61 'name':'TestOneDimArrayData',
62 'sources': ['Data/TestOneDimArrayData.cpp'],
63 'deps': [sciqlop_core, qt5test]
64 },
65 {
66 'name':'TestScalarSeries',
67 'sources': [
68 'Data/TestScalarSeries.cpp',
69 ],
70 'deps': [sciqlop_core, qt5test, DataSeriesTestsUtils_dep]
71 },
72 {
73 'name':'TestTwoDimArrayData',
74 'sources': ['Data/TestTwoDimArrayData.cpp'],
75 'deps': [sciqlop_core, qt5test]
76 },
77 {
78 'name':'TestVectorSeries',
79 'sources': [
80 'Data/TestVectorSeries.cpp',
81 ],
82 'deps': [sciqlop_core, qt5test, DataSeriesTestsUtils_dep]
83 },
84 {
85 'name':'TestDataSourceController',
86 'sources': [
87 'DataSource/TestDataSourceController.cpp',
88 'DataSource/DataSourceItemBuilder.cpp'
89 ],
90 'deps': [sciqlop_core, qt5test]
91 },
92 {
93 'name':'TestDataSourceItem',
94 'sources': [
95 'DataSource/TestDataSourceItem.cpp',
96 'DataSource/DataSourceItemBuilder.cpp'
97 ],
98 'deps': [sciqlop_core, qt5test]
99 },
100 {
101 'name':'TestVariable',
102 'sources': ['Variable/TestVariable.cpp'],
103 'deps': [sciqlop_core, qt5test]
104 },
105 {
106 'name':'TestDownloader',
107 'sources': ['Network/TestDownloader.cpp'],
108 'deps': [sciqlop_core, qt5test, qt5Concurrent]
109 },
110 {
111 'name':'TestVariableController2',
112 'sources': ['Variable/TestVariableController2.cpp'],
113 'deps': [sciqlop_core, qt5test, qt5Concurrent, TestUtils_dep]
114 },
115 {
116 'name':'TestVariableController2Async',
117 'sources': ['Variable/TestVariableController2Async.cpp'],
118 'deps': [sciqlop_core, qt5test, qt5Concurrent, TestUtils_dep]
119 },
120 {
121 'name':'TestVariableController2WithSync',
122 'sources': ['Variable/TestVariableController2WithSync.cpp'],
123 'deps': [sciqlop_core, qt5test, qt5Concurrent, TestUtils_dep]
124 }
26 ]
125 ]
27
126
28 foreach unit_test : tests
127 foreach unit_test : tests
29 test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
128 test_moc_files = qt5.preprocess(moc_sources : unit_test['sources'])
30 test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
129 test_exe = executable(unit_test['name'],unit_test['sources'] , test_moc_files,
31 dependencies : [sciqlop_core, qt5test],
130 dependencies : unit_test['deps'],
32 cpp_args : ['-DCORE_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/../tests-resources"'],
131 cpp_args : ['-DCORE_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/../tests-resources"']
33 sources : [amdatest_sources])
132 )
34 test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])])
133 test('Test-' + unit_test['name'], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test['name'])])
35 endforeach
134 endforeach
36
135
General Comments 0
You need to be logged in to leave comments. Login now