##// END OF EJS Templates
Update meson to add CatalogueAPIsubproject
Thibaud Rabillard -
r1103:232a14795d1d
parent child
Show More
@@ -0,0 +1,4
1 [wrap-git]
2 directory=CatalogueAPI
3 url=https://hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/CatalogueAPI.git
4 revision=head
@@ -1,4 +1,7
1
1
2
3 catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','catalogueapi_dep'])
4
2 core_moc_headers = [
5 core_moc_headers = [
3 'include/Data/IDataProvider.h',
6 'include/Data/IDataProvider.h',
4 'include/DataSource/DataSourceController.h',
7 'include/DataSource/DataSourceController.h',
@@ -52,14 +55,14 sciqlop_core_lib = library('sciqlopcore',
52 core_moc_files,
55 core_moc_files,
53 cpp_args : '-DCORE_LIB',
56 cpp_args : '-DCORE_LIB',
54 include_directories : core_inc,
57 include_directories : core_inc,
55 dependencies : [qt5core, qt5network],
58 dependencies : [qt5core, qt5network, catalogueapi_dep],
56 install : true
59 install : true
57 )
60 )
58
61
59
62
60 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
63 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
61 include_directories : core_inc,
64 include_directories : core_inc,
62 dependencies : [qt5core, qt5network])
65 dependencies : [qt5core, qt5network, catalogueapi_dep])
63
66
64
67
65 subdir('tests')
68 subdir('tests')
General Comments 3
Under Review
author

Auto status change to "Under Review"

Approved

Status change > Approved

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