Auto status change to "Under Review"
| @@ -1,69 +1,73 | |||
|
|
1 | 1 | |
|
|
2 | qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep']) | |
|
|
3 | catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','CatalogueAPI_dep']) | |
|
|
2 | 4 | |
|
|
3 | catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','catalogueapi_dep']) | |
|
|
4 | 5 | |
|
|
5 | 6 | core_moc_headers = [ |
|
|
7 | 'include/Catalogue/CatalogueController.h', | |
|
|
6 | 8 | 'include/Data/IDataProvider.h', |
|
|
7 | 9 | 'include/DataSource/DataSourceController.h', |
|
|
8 | 10 | 'include/DataSource/DataSourceItemAction.h', |
|
|
9 | 11 | 'include/Network/NetworkController.h', |
|
|
10 | 12 | 'include/Time/TimeController.h', |
|
|
11 | 13 | 'include/Variable/Variable.h', |
|
|
12 | 14 | 'include/Variable/VariableCacheController.h', |
|
|
13 | 15 | 'include/Variable/VariableController.h', |
|
|
14 | 16 | 'include/Variable/VariableAcquisitionWorker.h', |
|
|
15 | 17 | 'include/Variable/VariableSynchronizationGroup.h', |
|
|
16 | 18 | 'include/Variable/VariableModel.h', |
|
|
17 | 19 | 'include/Visualization/VisualizationController.h' |
|
|
18 | 20 | ] |
|
|
19 | 21 | |
|
|
20 | 22 | |
|
|
21 | 23 | core_moc_files = qt5.preprocess(moc_headers : core_moc_headers) |
|
|
22 | 24 | |
|
|
23 | 25 | core_sources = [ |
|
|
24 | 26 | 'src/Common/DateUtils.cpp', |
|
|
25 | 27 | 'src/Common/StringUtils.cpp', |
|
|
26 | 28 | 'src/Common/MimeTypesDef.cpp', |
|
|
29 | 'src/Catalogue/CatalogueController.cpp', | |
|
|
27 | 30 | 'src/Data/ScalarSeries.cpp', |
|
|
28 | 31 | 'src/Data/SpectrogramSeries.cpp', |
|
|
29 | 32 | 'src/Data/DataSeriesIterator.cpp', |
|
|
30 | 33 | 'src/Data/ArrayDataIterator.cpp', |
|
|
31 | 34 | 'src/Data/VectorSeries.cpp', |
|
|
32 | 35 | 'src/Data/OptionalAxis.cpp', |
|
|
33 | 36 | 'src/Data/DataSeriesUtils.cpp', |
|
|
34 | 37 | 'src/DataSource/DataSourceController.cpp', |
|
|
35 | 38 | 'src/DataSource/DataSourceItem.cpp', |
|
|
36 | 39 | 'src/DataSource/DataSourceItemAction.cpp', |
|
|
37 | 40 | 'src/DataSource/DataSourceItemMergeHelper.cpp', |
|
|
38 | 41 | 'src/Network/NetworkController.cpp', |
|
|
39 | 42 | 'src/Plugin/PluginManager.cpp', |
|
|
40 | 43 | 'src/Settings/SqpSettingsDefs.cpp', |
|
|
41 | 44 | 'src/Time/TimeController.cpp', |
|
|
42 | 45 | 'src/Variable/Variable.cpp', |
|
|
43 | 46 | 'src/Variable/VariableCacheController.cpp', |
|
|
44 | 47 | 'src/Variable/VariableController.cpp', |
|
|
45 | 48 | 'src/Variable/VariableAcquisitionWorker.cpp', |
|
|
46 | 49 | 'src/Variable/VariableSynchronizationGroup.cpp', |
|
|
47 | 50 | 'src/Variable/VariableModel.cpp', |
|
|
48 | 51 | 'src/Visualization/VisualizationController.cpp' |
|
|
49 | 52 | ] |
|
|
50 | 53 | |
|
|
51 | 54 | core_inc = include_directories(['include', '../plugin/include']) |
|
|
52 | 55 | |
|
|
53 | 56 | sciqlop_core_lib = library('sciqlopcore', |
|
|
54 | 57 | core_sources, |
|
|
55 | 58 | core_moc_files, |
|
|
56 | 59 | cpp_args : '-DCORE_LIB', |
|
|
57 | 60 | include_directories : core_inc, |
|
|
58 | 61 | dependencies : [qt5core, qt5network, catalogueapi_dep], |
|
|
59 | 62 | install : true |
|
|
60 | 63 | ) |
|
|
61 | 64 | |
|
|
62 | 65 | |
|
|
63 | 66 | sciqlop_core = declare_dependency(link_with : sciqlop_core_lib, |
|
|
64 | 67 | include_directories : core_inc, |
|
|
65 | 68 | dependencies : [qt5core, qt5network, catalogueapi_dep]) |
|
|
66 | 69 | |
|
|
67 | 70 | |
|
|
71 | ||
|
|
68 | 72 | subdir('tests') |
|
|
69 | 73 | |
General Comments 3
Status change > Approved
You need to be logged in to leave comments.
Login now