From 24f31ec545d2e177fc2212ecdb457e01533b6fbb 2019-03-01 15:53:20 From: Alexis Jeandet Date: 2019-03-01 15:53:20 Subject: [PATCH] Updated Meson build definitions Signed-off-by: Alexis Jeandet --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 033aad4..cb0ec43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,6 @@ FILE (GLOB_RECURSE core_SRCS ./include/Common/cpp_utils.h ./include/Plugin/IPlugin.h ./include/Data/ArrayDataIterator.h - ./include/Data/VariableRequest.h ./include/Data/VectorSeries.h ./include/Data/DateTimeRange.h ./include/Data/DateTimeRangeHelper.h diff --git a/external/catalogicpp b/external/catalogicpp index 515e439..2a5d07e 160000 --- a/external/catalogicpp +++ b/external/catalogicpp @@ -1 +1 @@ -Subproject commit 515e439a3023209e04a568b8a6bcafc45415a364 +Subproject commit 2a5d07eb09ec47f8e33984a845a041220d176cfa diff --git a/include/Data/VariableRequest.h b/include/Data/VariableRequest.h deleted file mode 100644 index b741076..0000000 --- a/include/Data/VariableRequest.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef SCIQLOP_VARIABLEREQUEST_H -#define SCIQLOP_VARIABLEREQUEST_H - -#include - -#include - -#include -#include -#include - -#include - -/** - * @brief The VariableRequest struct holds the information of an acquisition request - */ -struct VariableRequest { - QUuid m_VariableGroupId; - DateTimeRange m_RangeRequested; - DateTimeRange m_CacheRangeRequested; - std::shared_ptr m_DataSeries; -}; - -SCIQLOP_REGISTER_META_TYPE(VARIABLEREQUEST_REGISTRY, VariableRequest) - -#endif // SCIQLOP_VARIABLEREQUEST_H diff --git a/meson.build b/meson.build index 83f22fc..7799e98 100644 --- a/meson.build +++ b/meson.build @@ -1,65 +1,65 @@ -qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep']) -libcatalogs_dep = dependency('libcatalogs', required : true, fallback:['libcatalogs','libcatalogs_dep']) +catalogicpp_dep = dependency('catalogicpp', required : true, fallback:['catalogicpp','catalogicpp_dep']) pybind11_dep = dependency('pybind11', required : true, fallback:['pybind11','pybind11_dep']) core_moc_headers = [ - 'include/Network/Response.h', - 'include/Network/NetworkController.h', - 'include/Network/Downloader.h', - 'include/DataSource/DataSourceItem.h', - 'include/DataSource/DataSourceItemMergeHelper.h', - 'include/DataSource/DataSourceItemAction.h', - 'include/DataSource/DataSourceController.h', - 'include/Common/spimpl.h', - 'include/Common/StringUtils.h', - 'include/Common/SignalWaiter.h', - 'include/Common/MimeTypesDef.h', - 'include/Common/SortUtils.h', - 'include/Common/containers.h', - 'include/Common/debug.h', - 'include/Common/DateUtils.h', - 'include/Common/deprecate.h', - 'include/Common/MetaTypes.h', - 'include/Common/Numeric.h', - 'include/Time/TimeController.h', - 'include/Data/ArrayDataIterator.h', - 'include/Data/ScalarSeries.h', - 'include/Data/DataSeriesUtils.h', - 'include/Data/DataProviderParameters.h', - 'include/Data/DataSeriesMergeHelper.h', - 'include/Data/ArrayData.h', - 'include/Data/DateTimeRangeHelper.h', - 'include/Data/VectorSeries.h', - 'include/Data/DataSeries.h', - 'include/Data/SpectrogramSeries.h', - 'include/Data/SqpIterator.h', - 'include/Data/IDataProvider.h', - 'include/Data/DataSeriesIterator.h', - 'include/Data/DataSeriesType.h', - 'include/Data/Unit.h', - 'include/Data/IDataSeries.h', - 'include/Data/OptionalAxis.h', - 'include/Data/DateTimeRange.h', - 'include/Data/VariableRequest.h', - 'include/PluginManager/PluginManager.h', - 'include/Catalogue/CatalogueController.h', - 'include/Visualization/VisualizationController.h', - 'include/Settings/ISqpSettingsBindable.h', - 'include/Settings/SqpSettingsDefs.h', - 'include/Variable/ProportionalCacheStrategy.h', - 'include/Variable/VariableCacheStrategyFactory.h', - 'include/Variable/VariableSynchronizationGroup2.h', - 'include/Variable/VariableController2.h', - 'include/Variable/VariableModel2.h', - 'include/Variable/SingleThresholdCacheStrategy.h', - 'include/Variable/private/VCTransaction.h', - 'include/Variable/Variable.h', - 'include/Variable/VariableCacheStrategy.h', - 'include/CoreGlobal.h', - 'include/Plugin/IPlugin.h', - 'include/Version.h'] + './include/Common/containers.h', + './include/Common/StringUtils.h', + './include/Common/Numeric.h', + './include/Common/spimpl.h', + './include/Common/DateUtils.h', + './include/Common/MimeTypesDef.h', + './include/Common/SignalWaiter.h', + './include/Common/deprecate.h', + './include/Common/debug.h', + './include/Common/MetaTypes.h', + './include/Common/cpp_utils.h', + './include/Common/SortUtils.h', + './include/Data/DataSeries.h', + './include/Data/DataSeriesIterator.h', + './include/Data/DateTimeRangeHelper.h', + './include/Data/SpectrogramSeries.h', + './include/Data/DateTimeRange.h', + './include/Data/VectorSeries.h', + './include/Data/DataProviderParameters.h', + './include/Data/ArrayData.h', + './include/Data/Unit.h', + './include/Data/ScalarSeries.h', + './include/Data/SqpIterator.h', + './include/Data/IDataProvider.h', + './include/Data/DataSeriesUtils.h', + './include/Data/OptionalAxis.h', + './include/Data/IDataSeries.h', + './include/Data/DataSeriesType.h', + './include/Data/ArrayDataIterator.h', + './include/Data/DataSeriesMergeHelper.h', + './include/CoreGlobal.h', + './include/Network/NetworkController.h', + './include/Network/Response.h', + './include/Network/Downloader.h', + './include/Settings/SqpSettingsDefs.h', + './include/Settings/ISqpSettingsBindable.h', + './include/DataSource/DataSourceController.h', + './include/DataSource/DataSourceItem.h', + './include/DataSource/DataSourceItemAction.h', + './include/DataSource/DataSourceItemMergeHelper.h', + './include/Time/TimeController.h', + './include/PluginManager/PluginManager.h', + './include/Version.h', + './include/Catalogue/CatalogueController.h', + './include/Plugin/IPlugin.h', + './include/Variable/VariableModel2.h', + './include/Variable/Variable.h', + './include/Variable/VariableCacheStrategy.h', + './include/Variable/VariableController2.h', + './include/Variable/VariableCacheStrategyFactory.h', + './include/Variable/VariableSynchronizationGroup2.h', + './include/Variable/ProportionalCacheStrategy.h', + './include/Variable/private/VCTransaction.h', + './include/Variable/SingleThresholdCacheStrategy.h', + './include/Visualization/VisualizationController.h' + ] core_moc_sources = ['src/Network/Downloader.cpp'] @@ -68,35 +68,36 @@ core_moc_sources = ['src/Network/Downloader.cpp'] core_moc_files = qt5.preprocess(moc_headers : core_moc_headers, moc_sources: core_moc_sources) core_sources = [ - 'src/Network/NetworkController.cpp', - 'src/Network/Downloader.cpp', - 'src/DataSource/DataSourceItem.cpp', - 'src/DataSource/DataSourceController.cpp', - 'src/DataSource/DataSourceItemMergeHelper.cpp', - 'src/DataSource/DataSourceItemAction.cpp', - 'src/Common/MimeTypesDef.cpp', - 'src/Common/SignalWaiter.cpp', - 'src/Common/StringUtils.cpp', - 'src/Common/DateUtils.cpp', - 'src/Time/TimeController.cpp', - 'src/Data/DataSeriesUtils.cpp', - 'src/Data/VectorSeries.cpp', - 'src/Data/DataSeriesIterator.cpp', - 'src/Data/ScalarSeries.cpp', - 'src/Data/SpectrogramSeries.cpp', - 'src/Data/OptionalAxis.cpp', - 'src/Data/ArrayDataIterator.cpp', - #'src/pybind11_wrappers/QtWrappers.cpp', - #'src/pybind11_wrappers/CoreWrappers.cpp', - 'src/PluginManager/PluginManager.cpp', - 'src/Catalogue/CatalogueController.cpp', - 'src/Visualization/VisualizationController.cpp', - 'src/Settings/SqpSettingsDefs.cpp', - 'src/Variable/Variable.cpp', - 'src/Variable/VariableSynchronizationGroup2.cpp', - 'src/Variable/VariableController2.cpp', - 'src/Variable/VariableModel2.cpp', - 'src/Version.cpp'] + './src/Common/MimeTypesDef.cpp', + './src/Common/SignalWaiter.cpp', + './src/Common/DateUtils.cpp', + './src/Common/StringUtils.cpp', + './src/Data/VectorSeries.cpp', + './src/Data/ScalarSeries.cpp', + './src/Data/OptionalAxis.cpp', + './src/Data/DataSeriesIterator.cpp', + './src/Data/SpectrogramSeries.cpp', + './src/Data/ArrayDataIterator.cpp', + './src/Data/DataSeriesUtils.cpp', + './src/Network/Downloader.cpp', + './src/Network/NetworkController.cpp', + './src/Settings/SqpSettingsDefs.cpp', + './src/DataSource/DataSourceItemAction.cpp', + './src/DataSource/DataSourceItemMergeHelper.cpp', + './src/DataSource/DataSourceItem.cpp', + './src/DataSource/DataSourceController.cpp', + './src/Time/TimeController.cpp', + './src/PluginManager/PluginManager.cpp', + './src/pybind11_wrappers/CatalogWrappers.cpp', + #'./src/pybind11_wrappers/QtWrappers.cpp', + #'./src/pybind11_wrappers/CoreWrappers.cpp', + './src/Version.cpp', + './src/Catalogue/CatalogueController.cpp', + './src/Variable/Variable.cpp', + './src/Variable/VariableSynchronizationGroup2.cpp', + './src/Variable/VariableController2.cpp', + './src/Variable/VariableModel2.cpp', + './src/Visualization/VisualizationController.cpp'] core_inc = include_directories(['include', 'include/Plugin']) @@ -106,14 +107,14 @@ sciqlop_core_lib = library('sciqlopcore', core_moc_files, cpp_args : '-DCORE_LIB', include_directories : core_inc, - dependencies : [qt5core, qt5network, libcatalogs_dep, pybind11_dep], + dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep], install : true ) sciqlop_core = declare_dependency(link_with : sciqlop_core_lib, include_directories : core_inc, - dependencies : [qt5core, qt5network, libcatalogs_dep, pybind11_dep]) + dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep])