HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1355:a29174c00b30

Updated meson build build definitions...

jeandet -

r1355:a29174c00b30

parent child

Context file:

r1355:a29174c00b30

.gitignore +1 -2

             core/src/Version.cpp
             core/include/Version.h
 rdparty/
-            subprojects/CatalogueAPI/
+            subprojects/*
-            subprojects/QxOrm/
             documentation/*
             **/.idea/*
             **/__pycache__/*

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 8f50e908dd3175c425d6f3fd1d8cb2f552cff3f9		1	Subproject commit 35ef46382be5819f5a0f683e56312d3fb4844f86

gui/meson.build +1 -1

               'src/Catalogue/CatalogueTreeModel.cpp'
             ]
-            gui_inc = include_directories(['include'])
+            gui_inc = include_directories(['include', 'include/Visualization'])
             sciqlop_gui_lib = library('sciqlopgui',
                                    gui_sources,

meson.build +2 -1

-            project('SciQLOP', 'cpp',default_options : ['cpp_std=c++14'])
+            project('SciQLOP', 'cpp',default_options : ['cpp_std=c++17'], meson_version:'>=0.47.0')
             qt5 = import('qt5')
             qt5core = dependency('qt5', modules : 'Core')
             qt5xml = dependency('qt5', modules : 'Xml')
             qt5network = dependency('qt5', modules : 'Network')
             qt5printsupport = dependency('qt5', modules : 'PrintSupport')
+            qt5Concurrent = dependency('qt5', modules : 'Concurrent')
             qt5test = dependency('qt5', modules : 'Test')
             moc = find_program('moc-qt5','moc')

plugins/mockplugin/meson.build 0 -14

@@ -30,17 +30,3 sciqlop_mockplugin = library('mockplugin',
30	dependencies : [sciqlop_core, sciqlop_gui],	30	dependencies : [sciqlop_core, sciqlop_gui],
31	install : true	31	install : true
32	)	32	)
33
34	tests = [
35	[['tests/TestCosinusAcquisition.cpp'],'test_cosinus_acquisition','Cosinus Acquisition test']
36	]
37
38	foreach unit_test : tests
39	test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
40	test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
41	link_with : [sciqlop_mockplugin],
42	include_directories : [mockplugin_inc],
43	cpp_args : ['-DMOCKPLUGIN_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
44	dependencies : [sciqlop_core, sciqlop_gui, qt5test])
45	test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
46	endforeach

General Comments 0

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

No TODOs yet

	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