rlottie/meson: make rlottie buildable as a subproject

This commit is contained in:
subhransu mohanty 2019-07-04 19:47:51 +09:00 committed by Subhransu
parent 165fef76e6
commit 36eae75a5a
3 changed files with 9 additions and 4 deletions

View File

@ -16,7 +16,7 @@ executable('lottie2gif',
executable('vectorTest', executable('vectorTest',
'vectortest.cpp', 'vectortest.cpp',
include_directories : inc, include_directories : inc,
dependencies : [rlottie_dep]) dependencies : [rlottie_lib_dep])
demo_dep = dependency('elementary', required : false) demo_dep = dependency('elementary', required : false)

View File

@ -10,17 +10,22 @@ subdir('vector')
subdir('lottie') subdir('lottie')
subdir('binding') subdir('binding')
rlottie_dep = [ vector_dep, lottie_dep, binding_dep, dependency('threads')] rlottie_lib_dep = [ vector_dep, lottie_dep, binding_dep, dependency('threads')]
rlottie_lib = shared_library('rlottie', rlottie_lib = shared_library('rlottie',
include_directories : inc, include_directories : inc,
version : meson.project_version(), version : meson.project_version(),
dependencies : rlottie_dep, dependencies : rlottie_lib_dep,
install : true, install : true,
cpp_args : compiler_flags, cpp_args : compiler_flags,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
) )
# Make rlottie library usable as a Meson subproject.
rlottie_dep = declare_dependency(
include_directories: inc,
link_with : rlottie_lib)
pkg_mod = import('pkgconfig') pkg_mod = import('pkgconfig')
pkg_mod.generate( libraries : rlottie_lib, pkg_mod.generate( libraries : rlottie_lib,

View File

@ -12,7 +12,7 @@ vector_testsuite = executable('vectorTestSuite',
vector_test_sources, vector_test_sources,
include_directories : inc, include_directories : inc,
override_options : override_default, override_options : override_default,
dependencies : [gtest_dep, rlottie_dep], dependencies : [gtest_dep, rlottie_lib_dep],
) )
test('Vector Testsuite', vector_testsuite) test('Vector Testsuite', vector_testsuite)