##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » SciQLOPCore
RSS
Updated Meson build definitions...
jeandet -
r58:24f31ec545d2
parent child
Show More
Show file before | Show file after | Hide comments
@@ -80,7 +80,6 FILE (GLOB_RECURSE core_SRCS
80 ./include/Common/cpp_utils.h
80 ./include/Common/cpp_utils.h
81 ./include/Plugin/IPlugin.h
81 ./include/Plugin/IPlugin.h
82 ./include/Data/ArrayDataIterator.h
82 ./include/Data/ArrayDataIterator.h
83 ./include/Data/VariableRequest.h
84 ./include/Data/VectorSeries.h
83 ./include/Data/VectorSeries.h
85 ./include/Data/DateTimeRange.h
84 ./include/Data/DateTimeRange.h
86 ./include/Data/DateTimeRangeHelper.h
85 ./include/Data/DateTimeRangeHelper.h
Show file before | Show file after | Hide comments
@@ -1,1 +1,1
1 Subproject commit 515e439a3023209e04a568b8a6bcafc45415a364
1 Subproject commit 2a5d07eb09ec47f8e33984a845a041220d176cfa
Show file before | Show file after | Hide comments
@@ -1,65 +1,65
1
1
2 qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep'])
2 catalogicpp_dep = dependency('catalogicpp', required : true, fallback:['catalogicpp','catalogicpp_dep'])
3 libcatalogs_dep = dependency('libcatalogs', required : true, fallback:['libcatalogs','libcatalogs_dep'])
4 pybind11_dep = dependency('pybind11', required : true, fallback:['pybind11','pybind11_dep'])
3 pybind11_dep = dependency('pybind11', required : true, fallback:['pybind11','pybind11_dep'])
5
4
6
5
7 core_moc_headers = [
6 core_moc_headers = [
8 'include/Network/Response.h',
7 './include/Common/containers.h',
9 'include/Network/NetworkController.h',
8 './include/Common/StringUtils.h',
10 'include/Network/Downloader.h',
9 './include/Common/Numeric.h',
11 'include/DataSource/DataSourceItem.h',
10 './include/Common/spimpl.h',
12 'include/DataSource/DataSourceItemMergeHelper.h',
11 './include/Common/DateUtils.h',
13 'include/DataSource/DataSourceItemAction.h',
12 './include/Common/MimeTypesDef.h',
14 'include/DataSource/DataSourceController.h',
13 './include/Common/SignalWaiter.h',
15 'include/Common/spimpl.h',
14 './include/Common/deprecate.h',
16 'include/Common/StringUtils.h',
15 './include/Common/debug.h',
17 'include/Common/SignalWaiter.h',
16 './include/Common/MetaTypes.h',
18 'include/Common/MimeTypesDef.h',
17 './include/Common/cpp_utils.h',
19 'include/Common/SortUtils.h',
18 './include/Common/SortUtils.h',
20 'include/Common/containers.h',
19 './include/Data/DataSeries.h',
21 'include/Common/debug.h',
20 './include/Data/DataSeriesIterator.h',
22 'include/Common/DateUtils.h',
21 './include/Data/DateTimeRangeHelper.h',
23 'include/Common/deprecate.h',
22 './include/Data/SpectrogramSeries.h',
24 'include/Common/MetaTypes.h',
23 './include/Data/DateTimeRange.h',
25 'include/Common/Numeric.h',
24 './include/Data/VectorSeries.h',
26 'include/Time/TimeController.h',
25 './include/Data/DataProviderParameters.h',
27 'include/Data/ArrayDataIterator.h',
26 './include/Data/ArrayData.h',
28 'include/Data/ScalarSeries.h',
27 './include/Data/Unit.h',
29 'include/Data/DataSeriesUtils.h',
28 './include/Data/ScalarSeries.h',
30 'include/Data/DataProviderParameters.h',
29 './include/Data/SqpIterator.h',
31 'include/Data/DataSeriesMergeHelper.h',
30 './include/Data/IDataProvider.h',
32 'include/Data/ArrayData.h',
31 './include/Data/DataSeriesUtils.h',
33 'include/Data/DateTimeRangeHelper.h',
32 './include/Data/OptionalAxis.h',
34 'include/Data/VectorSeries.h',
33 './include/Data/IDataSeries.h',
35 'include/Data/DataSeries.h',
34 './include/Data/DataSeriesType.h',
36 'include/Data/SpectrogramSeries.h',
35 './include/Data/ArrayDataIterator.h',
37 'include/Data/SqpIterator.h',
36 './include/Data/DataSeriesMergeHelper.h',
38 'include/Data/IDataProvider.h',
37 './include/CoreGlobal.h',
39 'include/Data/DataSeriesIterator.h',
38 './include/Network/NetworkController.h',
40 'include/Data/DataSeriesType.h',
39 './include/Network/Response.h',
41 'include/Data/Unit.h',
40 './include/Network/Downloader.h',
42 'include/Data/IDataSeries.h',
41 './include/Settings/SqpSettingsDefs.h',
43 'include/Data/OptionalAxis.h',
42 './include/Settings/ISqpSettingsBindable.h',
44 'include/Data/DateTimeRange.h',
43 './include/DataSource/DataSourceController.h',
45 'include/Data/VariableRequest.h',
44 './include/DataSource/DataSourceItem.h',
46 'include/PluginManager/PluginManager.h',
45 './include/DataSource/DataSourceItemAction.h',
47 'include/Catalogue/CatalogueController.h',
46 './include/DataSource/DataSourceItemMergeHelper.h',
48 'include/Visualization/VisualizationController.h',
47 './include/Time/TimeController.h',
49 'include/Settings/ISqpSettingsBindable.h',
48 './include/PluginManager/PluginManager.h',
50 'include/Settings/SqpSettingsDefs.h',
49 './include/Version.h',
51 'include/Variable/ProportionalCacheStrategy.h',
50 './include/Catalogue/CatalogueController.h',
52 'include/Variable/VariableCacheStrategyFactory.h',
51 './include/Plugin/IPlugin.h',
53 'include/Variable/VariableSynchronizationGroup2.h',
52 './include/Variable/VariableModel2.h',
54 'include/Variable/VariableController2.h',
53 './include/Variable/Variable.h',
55 'include/Variable/VariableModel2.h',
54 './include/Variable/VariableCacheStrategy.h',
56 'include/Variable/SingleThresholdCacheStrategy.h',
55 './include/Variable/VariableController2.h',
57 'include/Variable/private/VCTransaction.h',
56 './include/Variable/VariableCacheStrategyFactory.h',
58 'include/Variable/Variable.h',
57 './include/Variable/VariableSynchronizationGroup2.h',
59 'include/Variable/VariableCacheStrategy.h',
58 './include/Variable/ProportionalCacheStrategy.h',
60 'include/CoreGlobal.h',
59 './include/Variable/private/VCTransaction.h',
61 'include/Plugin/IPlugin.h',
60 './include/Variable/SingleThresholdCacheStrategy.h',
62 'include/Version.h']
61 './include/Visualization/VisualizationController.h'
62 ]
63
63
64
64
65 core_moc_sources = ['src/Network/Downloader.cpp']
65 core_moc_sources = ['src/Network/Downloader.cpp']
@@ -68,35 +68,36 core_moc_sources = ['src/Network/Downloader.cpp']
68 core_moc_files = qt5.preprocess(moc_headers : core_moc_headers, moc_sources: core_moc_sources)
68 core_moc_files = qt5.preprocess(moc_headers : core_moc_headers, moc_sources: core_moc_sources)
69
69
70 core_sources = [
70 core_sources = [
71 'src/Network/NetworkController.cpp',
71 './src/Common/MimeTypesDef.cpp',
72 'src/Network/Downloader.cpp',
72 './src/Common/SignalWaiter.cpp',
73 'src/DataSource/DataSourceItem.cpp',
73 './src/Common/DateUtils.cpp',
74 'src/DataSource/DataSourceController.cpp',
74 './src/Common/StringUtils.cpp',
75 'src/DataSource/DataSourceItemMergeHelper.cpp',
75 './src/Data/VectorSeries.cpp',
76 'src/DataSource/DataSourceItemAction.cpp',
76 './src/Data/ScalarSeries.cpp',
77 'src/Common/MimeTypesDef.cpp',
77 './src/Data/OptionalAxis.cpp',
78 'src/Common/SignalWaiter.cpp',
78 './src/Data/DataSeriesIterator.cpp',
79 'src/Common/StringUtils.cpp',
79 './src/Data/SpectrogramSeries.cpp',
80 'src/Common/DateUtils.cpp',
80 './src/Data/ArrayDataIterator.cpp',
81 'src/Time/TimeController.cpp',
81 './src/Data/DataSeriesUtils.cpp',
82 'src/Data/DataSeriesUtils.cpp',
82 './src/Network/Downloader.cpp',
83 'src/Data/VectorSeries.cpp',
83 './src/Network/NetworkController.cpp',
84 'src/Data/DataSeriesIterator.cpp',
84 './src/Settings/SqpSettingsDefs.cpp',
85 'src/Data/ScalarSeries.cpp',
85 './src/DataSource/DataSourceItemAction.cpp',
86 'src/Data/SpectrogramSeries.cpp',
86 './src/DataSource/DataSourceItemMergeHelper.cpp',
87 'src/Data/OptionalAxis.cpp',
87 './src/DataSource/DataSourceItem.cpp',
88 'src/Data/ArrayDataIterator.cpp',
88 './src/DataSource/DataSourceController.cpp',
89 #'src/pybind11_wrappers/QtWrappers.cpp',
89 './src/Time/TimeController.cpp',
90 #'src/pybind11_wrappers/CoreWrappers.cpp',
90 './src/PluginManager/PluginManager.cpp',
91 'src/PluginManager/PluginManager.cpp',
91 './src/pybind11_wrappers/CatalogWrappers.cpp',
92 'src/Catalogue/CatalogueController.cpp',
92 #'./src/pybind11_wrappers/QtWrappers.cpp',
93 'src/Visualization/VisualizationController.cpp',
93 #'./src/pybind11_wrappers/CoreWrappers.cpp',
94 'src/Settings/SqpSettingsDefs.cpp',
94 './src/Version.cpp',
95 'src/Variable/Variable.cpp',
95 './src/Catalogue/CatalogueController.cpp',
96 'src/Variable/VariableSynchronizationGroup2.cpp',
96 './src/Variable/Variable.cpp',
97 'src/Variable/VariableController2.cpp',
97 './src/Variable/VariableSynchronizationGroup2.cpp',
98 'src/Variable/VariableModel2.cpp',
98 './src/Variable/VariableController2.cpp',
99 'src/Version.cpp']
99 './src/Variable/VariableModel2.cpp',
100 './src/Visualization/VisualizationController.cpp']
100
101
101
102
102 core_inc = include_directories(['include', 'include/Plugin'])
103 core_inc = include_directories(['include', 'include/Plugin'])
@@ -106,14 +107,14 sciqlop_core_lib = library('sciqlopcore',
106 core_moc_files,
107 core_moc_files,
107 cpp_args : '-DCORE_LIB',
108 cpp_args : '-DCORE_LIB',
108 include_directories : core_inc,
109 include_directories : core_inc,
109 dependencies : [qt5core, qt5network, libcatalogs_dep, pybind11_dep],
110 dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep],
110 install : true
111 install : true
111 )
112 )
112
113
113
114
114 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
115 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
115 include_directories : core_inc,
116 include_directories : core_inc,
116 dependencies : [qt5core, qt5network, libcatalogs_dep, pybind11_dep])
117 dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep])
117
118
118
119
119
120
Show file before | Show file after | Hide comments
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