##// END OF EJS Templates
change core meson config to include CatalogueAPI depends
perrinel -
r1104:c784890db0f9
parent child
Show More
@@ -1,8 +1,10
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',
@@ -24,6 +26,7 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',
@@ -65,5 +68,6 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
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
author

Auto status change to "Under Review"

Approved

Status change > Approved

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