From: Hermet Park Date: Wed, 8 Jul 2020 01:51:34 +0000 (+0900) Subject: build: refactoring meson script. X-Git-Tag: accepted/tizen/unified/20200806.062539~54 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F238041%2F1;p=platform%2Fcore%2Fgraphics%2Ftizenvg.git build: refactoring meson script. move out engine/loader dependency to its immediate parent folders. Change-Id: I7f08433fc6d2a333951fceaffea81cbe2e5da9e3 --- diff --git a/meson.build b/meson.build index 66b907d..0142de0 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('thorvg', 'cpp', - default_options : ['buildtype=debugoptimized', 'werror=false', 'cpp_std=c++17', 'optimization=s'], + default_options : ['buildtype=debugoptimized', 'werror=false', 'optimization=s'], version : '0.1.0', license : 'Apache-2.0') diff --git a/src/lib/meson.build b/src/lib/meson.build index 53c9a19..9a7dc61 100644 --- a/src/lib/meson.build +++ b/src/lib/meson.build @@ -25,8 +25,10 @@ source_file = [ 'tvgSwCanvas.cpp', ] -src_dep = declare_dependency( +engine_dep = [swengine_dep, glengine_dep] + +common_dep = declare_dependency( + dependencies : engine_dep, include_directories : include_directories('.'), - sources : source_file + sources : source_file ) - diff --git a/src/loaders/meson.build b/src/loaders/meson.build index 53186dd..3abf0fd 100644 --- a/src/loaders/meson.build +++ b/src/loaders/meson.build @@ -1 +1,6 @@ subdir('svg_loader') + +loader_dep = declare_dependency( + dependencies : svgloader_dep, + include_directories : include_directories('.'), +) diff --git a/src/meson.build b/src/meson.build index 7320bb2..faff2b3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -5,8 +5,7 @@ subdir('loaders') subdir('examples') thread_dep = meson.get_compiler('cpp').find_library('pthread') -thorvg_lib_dep = [ src_dep, swengine_dep, glengine_dep, svgloader_dep, thread_dep] - +thorvg_lib_dep = [ common_dep, loader_dep, thread_dep] thorvg_lib = library( 'thorvg',