From a29174c00b30fe201072ae9f12688d5889d1f245 2018-09-07 18:23:41
From: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Date: 2018-09-07 18:23:41
Subject: [PATCH] Updated meson build build definitions

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

---

diff --git a/.gitignore b/.gitignore
index 7e2e3d9..7b026f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,7 @@ CMakeLists.txt.user
 core/src/Version.cpp
 core/include/Version.h
 3rdparty/
-subprojects/CatalogueAPI/
-subprojects/QxOrm/
+subprojects/*
 documentation/*
 **/.idea/*
 **/__pycache__/*
diff --git a/core b/core
index 8f50e90..35ef463 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 8f50e908dd3175c425d6f3fd1d8cb2f552cff3f9
+Subproject commit 35ef46382be5819f5a0f683e56312d3fb4844f86
diff --git a/gui/meson.build b/gui/meson.build
index e1c2c62..8d996dc 100644
--- a/gui/meson.build
+++ b/gui/meson.build
@@ -127,7 +127,7 @@ gui_sources = [
   'src/Catalogue/CatalogueTreeModel.cpp'
 ]
 
-gui_inc = include_directories(['include'])
+gui_inc = include_directories(['include', 'include/Visualization'])
 
 sciqlop_gui_lib = library('sciqlopgui',
                        gui_sources,
diff --git a/meson.build b/meson.build
index 5a77de9..cfa4c8b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-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')
@@ -8,6 +8,7 @@ qt5svg = dependency('qt5', modules : 'Svg')
 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')
diff --git a/plugins/mockplugin/meson.build b/plugins/mockplugin/meson.build
index 3404ed3..daa88ca 100644
--- a/plugins/mockplugin/meson.build
+++ b/plugins/mockplugin/meson.build
@@ -30,17 +30,3 @@ sciqlop_mockplugin = library('mockplugin',
                        dependencies : [sciqlop_core, sciqlop_gui],
                        install : true
                        )
-
-tests = [
-  [['tests/TestCosinusAcquisition.cpp'],'test_cosinus_acquisition','Cosinus 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_mockplugin],
-                          include_directories : [mockplugin_inc],
-                          cpp_args : ['-DMOCKPLUGIN_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
-                          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