##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SCIQLOP-Initialisation
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Merge pull request 237 from SCIQLOP develop...
perrinel -
r593:4f5a18bbe2b7 merge
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,20 +1,20
1 1
2 2
3 3 tests = [
4 [['Data/TestDataSeries.cpp'],['test_data'],['DataSeries test']],
5 [['Data/TestOneDimArrayData.cpp'],['test_1d'],['One Dim Array test']],
6 [['Data/TestTwoDimArrayData.cpp'],['test_2d'],['Two Dim Array test']],
7 [['DataSource/TestDataSourceController.cpp'],['test_data_source'],['DataSourceController test']],
8 [['Variable/TestVariableCacheController.cpp'],['test_variable_cache'],['VariableCacheController test']],
9 [['Variable/TestVariable.cpp'],['test_variable'],['Variable test']]
4 [['Data/TestDataSeries.cpp'],'test_data','DataSeries test'],
5 [['Data/TestOneDimArrayData.cpp'],'test_1d','One Dim Array test'],
6 [['Data/TestTwoDimArrayData.cpp'],'test_2d','Two Dim Array test'],
7 [['DataSource/TestDataSourceController.cpp'],'test_data_source','DataSourceController test'],
8 [['Variable/TestVariableCacheController.cpp'],'test_variable_cache','VariableCacheController test'],
9 [['Variable/TestVariable.cpp'],'test_variable','Variable test']
10 10 ]
11 11
12 12 foreach unit_test : tests
13 13 test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
14 14 test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
15 15 link_with : sciqlop_core,
16 16 include_directories : core_inc,
17 17 dependencies : [qt5core, qt5widgets, qt5network,qt5test])
18 test(unit_test[2], test_exe)
18 test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])])
19 19 endforeach
20 20
Show file before | Show file after | Hide comments
@@ -1,36 +1,35
1 1 project('SciQLOP', 'cpp',default_options : ['cpp_std=c++14'])
2 2
3 3 qt5 = import('qt5')
4 4 qt5core = dependency('qt5', modules : 'Core')
5 5 qt5widgets = dependency('qt5', modules : 'Widgets')
6 6 qt5gui = dependency('qt5', modules : 'Gui')
7 7 qt5svg = dependency('qt5', modules : 'Svg')
8 8 qt5xml = dependency('qt5', modules : 'Xml')
9 9 qt5network = dependency('qt5', modules : 'Network')
10 10 qt5printsupport = dependency('qt5', modules : 'PrintSupport')
11 11 qt5test = dependency('qt5', modules : 'Test')
12 12
13 13 moc = find_program('moc','moc-qt5')
14 14
15 15 subdir('core')
16 16 subdir('gui')
17 17 subdir('app')
18 18 subdir('plugins')
19 19
20 20 if build_machine.system()=='darwin'
21 21 install_data('build_cfg/mac/sciqlopLOGO.icns', install_dir : 'Contents/Resources')
22 22 install_data('build_cfg/mac/Info.plist', install_dir : 'Contents')
23 23 meson.add_install_script('build_cfg/mac/install_script.sh')
24 24 elif host_machine.system()=='windows'
25 25 meson.add_install_script('build_cfg/windows/install_script.sh')
26 26 endif
27 27
28 28 cppcheck = find_program('cppcheck', required : false)
29 29
30 30 if cppcheck.found()
31 31 run_target('cppcheck',
32 32 command : [cppcheck, '--enable=all',
33 '--project=' + join_paths(meson.build_root(), 'compile_commands.json')],
34 build_by_default : true
33 '--project=' + join_paths(meson.build_root(), 'compile_commands.json')]
35 34 )
36 35 endif
Show file before | Show file after | Hide comments
@@ -1,61 +1,61
1 1
2 2 amdaplugin_moc_headers = [
3 3 'include/AmdaPlugin.h'
4 4 ]
5 5
6 6 amdaplugin_sources = [
7 7 'src/AmdaDefs.cpp',
8 8 'src/AmdaParser.cpp',
9 9 'src/AmdaPlugin.cpp',
10 10 'src/AmdaProvider.cpp',
11 11 'src/AmdaResultParser.cpp'
12 12 ]
13 13
14 14 amdaplugin_ui_files = []
15 15 amdaplugin_resources_files = [
16 16 'resources/amdaresources.qrc'
17 17 ]
18 18
19 19 amdaplugin_inc = include_directories(['include', '../../plugin/include'])
20 20
21 21 gen = generator(moc,
22 22 output : 'moc_@BASENAME@.cpp',
23 23 arguments : ['@INPUT@',
24 24 '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"',
25 25 '-I', meson.current_source_dir()+'/include',
26 26 '-I', meson.current_source_dir()+'/../../plugin/include',
27 27 '-o', '@OUTPUT@'])
28 28
29 29 amdaplugin_moc_plugin_files = gen.process(amdaplugin_moc_headers)
30 30
31 31 amdaplugin_moc_files = qt5.preprocess(
32 32 ui_files : amdaplugin_ui_files,
33 33 qresources : amdaplugin_resources_files)
34 34
35 35 sciqlop_amdaplugin = library('amdaplugin',
36 36 amdaplugin_sources,
37 37 amdaplugin_moc_files,
38 38 amdaplugin_moc_plugin_files,
39 39 cpp_args : '-DAMDA_LIB',
40 40 link_with : [sciqlop_core, sciqlop_gui],
41 41 include_directories : [amdaplugin_inc, core_inc, gui_inc],
42 42 dependencies : [qt5core, qt5gui, qt5widgets, qt5network],
43 43 install : true
44 44 )
45 45
46 46
47 47 tests = [
48 [['tests/TestAmdaParser.cpp'],['test_amda_parser'],['AMDA parser test']],
49 [['tests/TestAmdaResultParser.cpp'],['test_amda_result_parser'],['AMDA result parser test']],
50 [['tests/TestAmdaAcquisition.cpp'],['test_amda_acquisition'],['AMDA Acquisition test']]
48 [['tests/TestAmdaParser.cpp'],'test_amda_parser','AMDA parser test'],
49 [['tests/TestAmdaResultParser.cpp'],'test_amda_result_parser','AMDA result parser test'],
50 [['tests/TestAmdaAcquisition.cpp'],'test_amda_acquisition','AMDA Acquisition test']
51 51 ]
52 52
53 53 foreach unit_test : tests
54 54 test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
55 55 test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
56 56 link_with : [sciqlop_core, sciqlop_amdaplugin, sciqlop_gui],
57 57 include_directories : [core_inc, amdaplugin_inc, gui_inc],
58 58 cpp_args : ['-DAMDA_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
59 59 dependencies : [qt5core, qt5widgets, qt5network,qt5test])
60 test(unit_test[2], test_exe,timeout: 3 * 60)
60 test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
61 61 endforeach
General Comments 3
Under Review
perrinel
author
Comment #1958
Edit
Delete
|

Auto status change to "Under Review"

Approved
perrinel
author
Comment #1959
Edit
Delete
|

Status change > Approved

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