GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r617:831cc540a74a

Some Meson improvements, now declare dependency for each lib...

jeandet -

r617:831cc540a74a

parent child

Context file:

r617:831cc540a74a

app/meson.build +2 -3

             app_moc_headers = [
               'include/MainWindow.h'
             ]
             app_ui_files = [
               'ui/MainWindow.ui'
             ]
             app_qresources = ['resources/qlopapp.qrc']
             app_moc_files = qt5.preprocess(moc_headers : app_moc_headers,
                                            ui_files : app_ui_files,
                                            qresources : app_qresources)
             app_sources = [
               'src/Main.cpp',
               'src/MainWindow.cpp'
             ]
             app_inc = include_directories(['include'])
             if host_machine.system()=='windows' or build_machine.system()=='windows'
               winmod = import('windows')
               rc = winmod.compile_resources('resources/qlopapp.rc')
             else
               rc = []
             endif
             sciqlop_app = executable('sciqlop',
                                    app_sources,
                                    app_moc_files,
                                    rc,
-                                   link_with : [sciqlop_core, sciqlop_gui],
+                                   include_directories : [ app_inc],
-                                   include_directories : [gui_inc, core_inc, app_inc],
+                                   dependencies : [sciqlop_gui, sciqlop_core],
-                                   dependencies : [qt5core, qt5printsupport, qt5gui, qt5widgets, qt5network],
                                    install : true
                                    )

core/meson.build +8 -2

             core_moc_headers = [
               'include/Data/IDataProvider.h',
               'include/DataSource/DataSourceController.h',
               'include/DataSource/DataSourceItemAction.h',
               'include/Network/NetworkController.h',
               'include/Time/TimeController.h',
               'include/Variable/Variable.h',
               'include/Variable/VariableCacheController.h',
               'include/Variable/VariableController.h',
               'include/Variable/VariableAcquisitionWorker.h',
               'include/Variable/VariableCacheStrategy.h',
               'include/Variable/VariableSynchronizationGroup.h',
               'include/Variable/VariableModel.h',
               'include/Visualization/VisualizationController.h'
             ]
             core_moc_files = qt5.preprocess(moc_headers : core_moc_headers)
             core_sources = [
               'src/Common/DateUtils.cpp',
               'src/Data/ScalarSeries.cpp',
               'src/Data/DataSeriesIterator.cpp',
               'src/Data/ArrayDataIterator.cpp',
               'src/Data/VectorSeries.cpp',
               'src/DataSource/DataSourceController.cpp',
               'src/DataSource/DataSourceItem.cpp',
               'src/DataSource/DataSourceItemAction.cpp',
               'src/Network/NetworkController.cpp',
               'src/Plugin/PluginManager.cpp',
               'src/Settings/SqpSettingsDefs.cpp',
               'src/Time/TimeController.cpp',
               'src/Variable/Variable.cpp',
               'src/Variable/VariableCacheController.cpp',
               'src/Variable/VariableController.cpp',
               'src/Variable/VariableAcquisitionWorker.cpp',
               'src/Variable/VariableCacheStrategy.cpp',
               'src/Variable/VariableSynchronizationGroup.cpp',
               'src/Variable/VariableModel.cpp',
               'src/Visualization/VisualizationController.cpp'
             ]
             core_inc = include_directories(['include', '../plugin/include'])
-            sciqlop_core = library('sciqlopcore',
+            sciqlop_core_lib = library('sciqlopcore',
                                    core_sources,
                                    core_moc_files,
                                    cpp_args : '-DCORE_LIB',
                                    include_directories : core_inc,
-                                   dependencies : [qt5core, qt5widgets, qt5network],
+                                   dependencies : [qt5core, qt5network],
                                    install : true
                                    )
+            sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
+                                            include_directories : core_inc,
+                                            dependencies : [qt5core, qt5network])
             subdir('tests')

core/tests/meson.build +1 -3

             tests = [
               [['Data/TestDataSeries.cpp'],'test_data','DataSeries test'],
               [['Data/TestOneDimArrayData.cpp'],'test_1d','One Dim Array test'],
               [['Data/TestTwoDimArrayData.cpp'],'test_2d','Two Dim Array test'],
               [['DataSource/TestDataSourceController.cpp'],'test_data_source','DataSourceController test'],
               [['Variable/TestVariableCacheController.cpp'],'test_variable_cache','VariableCacheController test'],
               [['Variable/TestVariable.cpp'],'test_variable','Variable test']
             ]
             foreach unit_test : tests
               test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
               test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
-                                      link_with : sciqlop_core,
+                                      dependencies : [sciqlop_core, qt5test])
-                                      include_directories : core_inc,
-                                      dependencies : [qt5core, qt5widgets, qt5network,qt5test])
               test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])])
             endforeach

gui/meson.build +7 -4

             gui_moc_headers = [
               'include/DataSource/DataSourceWidget.h',
               'include/Settings/SqpSettingsDialog.h',
               'include/Settings/SqpSettingsGeneralWidget.h',
               'include/SidePane/SqpSidePane.h',
               'include/SqpApplication.h',
               'include/TimeWidget/TimeWidget.h',
               'include/Variable/VariableInspectorWidget.h',
               'include/Visualization/qcustomplot.h',
               'include/Visualization/VisualizationGraphWidget.h',
               'include/Visualization/VisualizationTabWidget.h',
               'include/Visualization/VisualizationWidget.h',
               'include/Visualization/VisualizationZoneWidget.h'
             ]
             gui_ui_files = [
               'ui/DataSource/DataSourceWidget.ui',
               'ui/Settings/SqpSettingsDialog.ui',
               'ui/Settings/SqpSettingsGeneralWidget.ui',
               'ui/SidePane/SqpSidePane.ui',
               'ui/TimeWidget/TimeWidget.ui',
               'ui/Variable/VariableInspectorWidget.ui',
               'ui/Variable/VariableMenuHeaderWidget.ui',
               'ui/Visualization/VisualizationGraphWidget.ui',
               'ui/Visualization/VisualizationTabWidget.ui',
               'ui/Visualization/VisualizationWidget.ui',
               'ui/Visualization/VisualizationZoneWidget.ui'
             ]
             gui_qresources = ['resources/sqpguiresources.qrc']
             gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
                                            ui_files : gui_ui_files,
                                            qresources : gui_qresources)
             gui_sources = [
               'src/SqpApplication.cpp',
               'src/Common/ColorUtils.cpp',
               'src/DataSource/DataSourceTreeWidgetItem.cpp',
               'src/DataSource/DataSourceTreeWidgetHelper.cpp',
               'src/DataSource/DataSourceWidget.cpp',
               'src/Settings/SqpSettingsDialog.cpp',
               'src/Settings/SqpSettingsGeneralWidget.cpp',
               'src/SidePane/SqpSidePane.cpp',
               'src/TimeWidget/TimeWidget.cpp',
               'src/Variable/VariableInspectorWidget.cpp',
               'src/Variable/VariableMenuHeaderWidget.cpp',
               'src/Visualization/VisualizationGraphHelper.cpp',
               'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
               'src/Visualization/VisualizationGraphWidget.cpp',
               'src/Visualization/VisualizationTabWidget.cpp',
               'src/Visualization/VisualizationWidget.cpp',
               'src/Visualization/VisualizationZoneWidget.cpp',
               'src/Visualization/qcustomplot.cpp',
               'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
               'src/Visualization/operations/MenuBuilder.cpp',
               'src/Visualization/operations/RemoveVariableOperation.cpp',
               'src/Visualization/operations/RescaleAxeOperation.cpp'
             ]
             gui_inc = include_directories(['include'])
-            sciqlop_gui = library('sciqlopgui',
+            sciqlop_gui_lib = library('sciqlopgui',
                                    gui_sources,
                                    gui_moc_files,
-                                   link_with : sciqlop_core,
+                                   include_directories : [gui_inc],
-                                   include_directories : [gui_inc, core_inc],
+                                   dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core],
-                                   dependencies : [qt5core, qt5printsupport, qt5gui, qt5widgets, qt5network],
                                    install : true
                                    )
+            sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,
+                                            include_directories : gui_inc,
+                                            dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core])

plugins/amda/meson.build +5 -6

             amdaplugin_moc_headers = [
               'include/AmdaPlugin.h'
             ]
             amdaplugin_sources = [
               'src/AmdaDefs.cpp',
               'src/AmdaParser.cpp',
               'src/AmdaPlugin.cpp',
               'src/AmdaProvider.cpp',
               'src/AmdaResultParser.cpp'
             ]
             amdaplugin_ui_files = []
             amdaplugin_resources_files = [
               'resources/amdaresources.qrc'
             ]
             amdaplugin_inc = include_directories(['include', '../../plugin/include'])
             moc_gen = generator(moc,
                             output  : 'moc_@BASENAME@.cpp',
                             arguments : ['@INPUT@',
                              '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"',
                              '-I', meson.current_source_dir()+'/include',
                              '-I', meson.current_source_dir()+'/../../plugin/include',
                              '-o', '@OUTPUT@'])
             rcc_gen = generator(rcc,
                             output  : 'qrc_@BASENAME@.cpp',
                             arguments : ['--name=@BASENAME@"',
                              '--output',
                              '@OUTPUT@',
                              '@INPUT@'])
             amdaplugin_moc_plugin_files = moc_gen.process(amdaplugin_moc_headers)
             amdaplugin_rcc_plugin_files = rcc_gen.process(amdaplugin_resources_files)
             #amdaplugin_rcc_plugin_files = qt5.preprocess(
             #                               qresources : amdaplugin_resources_files)
             amdaplugin_moc_files = qt5.preprocess(
                                            ui_files : amdaplugin_ui_files)
             sciqlop_amdaplugin = library('amdaplugin',
                                    amdaplugin_sources,
                                    amdaplugin_moc_files,
                                    amdaplugin_rcc_plugin_files,
                                    amdaplugin_moc_plugin_files,
                                    cpp_args : ['-DAMDA_LIB','-DQT_PLUGIN'],
-                                   link_with : [sciqlop_core, sciqlop_gui],
+                                   include_directories : [amdaplugin_inc],
-                                   include_directories : [amdaplugin_inc, core_inc, gui_inc],
+                                   dependencies : [sciqlop_core, sciqlop_gui],
-                                   dependencies : [qt5core, qt5gui, qt5widgets, qt5network],
                                    install : true
                                    )
             tests = [
               [['tests/TestAmdaParser.cpp'],'test_amda_parser','AMDA parser test'],
               [['tests/TestAmdaResultParser.cpp'],'test_amda_result_parser','AMDA result parser test'],
               [['tests/TestAmdaAcquisition.cpp'],'test_amda_acquisition','AMDA Acquisition test']
             ]
             foreach unit_test : tests
               test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
               test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
-                                      link_with : [sciqlop_core, sciqlop_amdaplugin, sciqlop_gui],
+                                      link_with : [sciqlop_amdaplugin],
-                                      include_directories : [core_inc, amdaplugin_inc, gui_inc],
+                                      include_directories : [amdaplugin_inc],
                                       cpp_args : ['-DAMDA_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
-                                      dependencies : [qt5core, qt5widgets, qt5network,qt5test])
+                                      dependencies : [sciqlop_core, sciqlop_gui, qt5test])
               test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
             endforeach

plugins/mockplugin/meson.build +2 -3

             mockplugin_moc_headers = [
               'include/MockPlugin.h'
             ]
             mockplugin_sources = [
               'src/CosinusProvider.cpp',
               'src/MockPlugin.cpp'
             ]
             mockplugin_inc = include_directories(['include', '../../plugin/include'])
             gen = generator(moc,
                             output  : 'moc_@BASENAME@.cpp',
                             arguments : ['@INPUT@',
                              '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/mockplugin/resources/mockplugin.json"',
                              '-I', meson.current_source_dir()+'/include',
                              '-I', meson.current_source_dir()+'/../../plugin/include',
                              '-o', '@OUTPUT@'])
             mockplugin_moc_files = gen.process(mockplugin_moc_headers)
             sciqlop_mockplugin = library('mockplugin',
                                    mockplugin_sources,
                                    mockplugin_moc_files,
                                    cpp_args : '-DMOCKPLUGIN_LIB',
-                                   link_with : [sciqlop_core, sciqlop_gui],
+                                   include_directories : [mockplugin_inc],
-                                   include_directories : [mockplugin_inc, core_inc, gui_inc],
+                                   dependencies : [sciqlop_core, sciqlop_gui],
-                                   dependencies : [qt5core, qt5gui, qt5widgets, qt5network],
                                    install : true
                                    )

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages