From c784890db0f9d1d1abc9053787af2d025e09616c 2017-12-04 17:36:09 From: mperrinel Date: 2017-12-04 17:36:09 Subject: [PATCH] change core meson config to include CatalogueAPI depends --- diff --git a/core/meson.build b/core/meson.build index f23df53..cc49a89 100644 --- a/core/meson.build +++ b/core/meson.build @@ -1,8 +1,10 @@ +qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep']) +catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','CatalogueAPI_dep']) -catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','catalogueapi_dep']) core_moc_headers = [ + 'include/Catalogue/CatalogueController.h', 'include/Data/IDataProvider.h', 'include/DataSource/DataSourceController.h', 'include/DataSource/DataSourceItemAction.h', @@ -24,6 +26,7 @@ core_sources = [ 'src/Common/DateUtils.cpp', 'src/Common/StringUtils.cpp', 'src/Common/MimeTypesDef.cpp', + 'src/Catalogue/CatalogueController.cpp', 'src/Data/ScalarSeries.cpp', 'src/Data/SpectrogramSeries.cpp', 'src/Data/DataSeriesIterator.cpp', @@ -65,5 +68,6 @@ sciqlop_core = declare_dependency(link_with : sciqlop_core_lib, dependencies : [qt5core, qt5network, catalogueapi_dep]) + subdir('tests')