##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

change core meson config to include CatalogueAPI depends
perrinel -
r1104:c784890db0f9
parent child
Show More
Side by Side Unified
Context file:
r1104:c784890db0f9 Loading diff...:
Show file before | Show file after | Hide comments
@@ -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 core_moc_headers = [
6 core_moc_headers = [
7 'include/Catalogue/CatalogueController.h',
6 'include/Data/IDataProvider.h',
8 'include/Data/IDataProvider.h',
7 'include/DataSource/DataSourceController.h',
9 'include/DataSource/DataSourceController.h',
8 'include/DataSource/DataSourceItemAction.h',
10 'include/DataSource/DataSourceItemAction.h',
9 'include/Network/NetworkController.h',
11 'include/Network/NetworkController.h',
10 'include/Time/TimeController.h',
12 'include/Time/TimeController.h',
11 'include/Variable/Variable.h',
13 'include/Variable/Variable.h',
12 'include/Variable/VariableCacheController.h',
14 'include/Variable/VariableCacheController.h',
13 'include/Variable/VariableController.h',
15 'include/Variable/VariableController.h',
14 'include/Variable/VariableAcquisitionWorker.h',
16 'include/Variable/VariableAcquisitionWorker.h',
15 'include/Variable/VariableSynchronizationGroup.h',
17 'include/Variable/VariableSynchronizationGroup.h',
16 'include/Variable/VariableModel.h',
18 'include/Variable/VariableModel.h',
17 'include/Visualization/VisualizationController.h'
19 'include/Visualization/VisualizationController.h'
18 ]
20 ]
19
21
20
22
21 core_moc_files = qt5.preprocess(moc_headers : core_moc_headers)
23 core_moc_files = qt5.preprocess(moc_headers : core_moc_headers)
22
24
23 core_sources = [
25 core_sources = [
24 'src/Common/DateUtils.cpp',
26 'src/Common/DateUtils.cpp',
25 'src/Common/StringUtils.cpp',
27 'src/Common/StringUtils.cpp',
26 'src/Common/MimeTypesDef.cpp',
28 'src/Common/MimeTypesDef.cpp',
29 'src/Catalogue/CatalogueController.cpp',
27 'src/Data/ScalarSeries.cpp',
30 'src/Data/ScalarSeries.cpp',
28 'src/Data/SpectrogramSeries.cpp',
31 'src/Data/SpectrogramSeries.cpp',
29 'src/Data/DataSeriesIterator.cpp',
32 'src/Data/DataSeriesIterator.cpp',
30 'src/Data/ArrayDataIterator.cpp',
33 'src/Data/ArrayDataIterator.cpp',
31 'src/Data/VectorSeries.cpp',
34 'src/Data/VectorSeries.cpp',
32 'src/Data/OptionalAxis.cpp',
35 'src/Data/OptionalAxis.cpp',
33 'src/Data/DataSeriesUtils.cpp',
36 'src/Data/DataSeriesUtils.cpp',
34 'src/DataSource/DataSourceController.cpp',
37 'src/DataSource/DataSourceController.cpp',
35 'src/DataSource/DataSourceItem.cpp',
38 'src/DataSource/DataSourceItem.cpp',
36 'src/DataSource/DataSourceItemAction.cpp',
39 'src/DataSource/DataSourceItemAction.cpp',
37 'src/DataSource/DataSourceItemMergeHelper.cpp',
40 'src/DataSource/DataSourceItemMergeHelper.cpp',
38 'src/Network/NetworkController.cpp',
41 'src/Network/NetworkController.cpp',
39 'src/Plugin/PluginManager.cpp',
42 'src/Plugin/PluginManager.cpp',
40 'src/Settings/SqpSettingsDefs.cpp',
43 'src/Settings/SqpSettingsDefs.cpp',
41 'src/Time/TimeController.cpp',
44 'src/Time/TimeController.cpp',
42 'src/Variable/Variable.cpp',
45 'src/Variable/Variable.cpp',
43 'src/Variable/VariableCacheController.cpp',
46 'src/Variable/VariableCacheController.cpp',
44 'src/Variable/VariableController.cpp',
47 'src/Variable/VariableController.cpp',
45 'src/Variable/VariableAcquisitionWorker.cpp',
48 'src/Variable/VariableAcquisitionWorker.cpp',
46 'src/Variable/VariableSynchronizationGroup.cpp',
49 'src/Variable/VariableSynchronizationGroup.cpp',
47 'src/Variable/VariableModel.cpp',
50 'src/Variable/VariableModel.cpp',
48 'src/Visualization/VisualizationController.cpp'
51 'src/Visualization/VisualizationController.cpp'
49 ]
52 ]
50
53
51 core_inc = include_directories(['include', '../plugin/include'])
54 core_inc = include_directories(['include', '../plugin/include'])
52
55
53 sciqlop_core_lib = library('sciqlopcore',
56 sciqlop_core_lib = library('sciqlopcore',
54 core_sources,
57 core_sources,
55 core_moc_files,
58 core_moc_files,
56 cpp_args : '-DCORE_LIB',
59 cpp_args : '-DCORE_LIB',
57 include_directories : core_inc,
60 include_directories : core_inc,
58 dependencies : [qt5core, qt5network, catalogueapi_dep],
61 dependencies : [qt5core, qt5network, catalogueapi_dep],
59 install : true
62 install : true
60 )
63 )
61
64
62
65
63 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
66 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
64 include_directories : core_inc,
67 include_directories : core_inc,
65 dependencies : [qt5core, qt5network, catalogueapi_dep])
68 dependencies : [qt5core, qt5network, catalogueapi_dep])
66
69
67
70
71
68 subdir('tests')
72 subdir('tests')
69
73
General Comments 3
Under Review
perrinel
author
Comment #2716
Edit
Delete
|

Auto status change to "Under Review"

Approved
trabillard
Comment #2732
Edit
Delete
|

Status change > Approved

You need to be logged in to leave comments. Login now