From 232a14795d1d3ba6933d08a96a4a06199acc5b39 2017-12-04 17:36:09
From: Thibaud Rabillard
Date: 2017-12-04 17:36:09
Subject: [PATCH] Update meson to add CatalogueAPIsubproject

---

diff --git a/core/meson.build b/core/meson.build
index 864624b..f23df53 100644
--- a/core/meson.build
+++ b/core/meson.build
@@ -1,4 +1,7 @@
 
+
+catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','catalogueapi_dep'])
+
 core_moc_headers = [
   'include/Data/IDataProvider.h',
   'include/DataSource/DataSourceController.h',
@@ -52,14 +55,14 @@ sciqlop_core_lib = library('sciqlopcore',
                        core_moc_files,
                        cpp_args : '-DCORE_LIB',
                        include_directories : core_inc,
-                       dependencies : [qt5core, qt5network],
+                       dependencies : [qt5core, qt5network, catalogueapi_dep],
                        install : true
                        )
 
 
 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
                                 include_directories : core_inc,
-                                dependencies : [qt5core, qt5network])
+                                dependencies : [qt5core, qt5network, catalogueapi_dep])
 
 
 subdir('tests')
diff --git a/subprojects/CatalogueAPI.wrap b/subprojects/CatalogueAPI.wrap
new file mode 100644
index 0000000..349a087
--- /dev/null
+++ b/subprojects/CatalogueAPI.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=CatalogueAPI
+url=https://hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/CatalogueAPI.git
+revision=head