improved build instructions
This commit is contained in:
parent
f37cd75502
commit
b9d4375f5a
5 changed files with 18 additions and 14 deletions
12
meson.build
12
meson.build
|
@ -6,19 +6,19 @@ configure_file(output : 'config.h',
|
|||
configuration : conf_data)
|
||||
configuration_inc = include_directories('.')
|
||||
|
||||
cmake = import('cmake')
|
||||
|
||||
#csv = cmake.subproject('csv-parser')
|
||||
#csv_lib = csv.dependency('csv')
|
||||
|
||||
nlohmann_lib = dependency('nlohmann_json', version : '>=3.5.0', required : false)
|
||||
nlohmann_lib = dependency('nlohmann_json', version : '>=3.55.0', required : false)
|
||||
|
||||
if not nlohmann_lib.found()
|
||||
nlohmann = cmake.subproject('nlohmann_json',
|
||||
cmake_options : ['-DJSON_BuildTests=OFF', '-DCMAKE_BUILD_TYPE=Release'])
|
||||
nlohmann_lib = nlohmann.dependency('nlohmann_json')
|
||||
nlohmann_inc = include_directories('subprojects/nlohmann_json/single_include/nlohmann')
|
||||
nlohmann_lib = declare_dependency(include_directories : nlohmann_inc)
|
||||
endif
|
||||
|
||||
csv_inc = include_directories('subprojects/csv-parser/single_include')
|
||||
csv_dep = declare_dependency(include_directories : csv_inc)
|
||||
|
||||
singleapp_proj = subproject('singleapplication')
|
||||
singleapp_lib = singleapp_proj.get_variable('singleapp_lib')
|
||||
singleapp_dep = singleapp_proj.get_variable('singleapp_dep')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue