Commit 0180701a authored by Daniel Espinosa Ortiz's avatar Daniel Espinosa Ortiz

GCalc: setup subproject variable for VAPI directory

parent 4aec2b43
Pipeline #87029 passed with stages
in 16 minutes and 1 second
......@@ -154,7 +154,7 @@ libgcalc = library(VERSIONED_PROJECT_NAME,
vala_gir : GIR_NAME,
dependencies : gcalc_deps,
vala_args: [
'--vapidir='+vapi_dir,
'--vapidir='+gcalc_vapi_dir,
'--pkg=mpc',
'--pkg=mpfr'
],
......
......@@ -14,12 +14,7 @@ i18n = import('i18n')
libexec_dir = join_paths(get_option('prefix'), get_option('libexecdir'))
locale_dir = join_paths(get_option('prefix'), get_option('localedir'))
po_dir = join_paths(meson.source_root(), 'po')
vapi_dir = join_paths(meson.source_root(), 'vapi')
# Add our custom VAPI dir
add_project_arguments(['--vapidir', vapi_dir],
language: 'vala'
)
gcalc_vapi_dir = join_paths(meson.current_source_dir(), 'vapi')
# Dependencies
glib_min_version = '2.40.0'
......@@ -50,13 +45,13 @@ libmath = cc.find_library('m')
mpc = declare_dependency(
dependencies: [
cc.find_library('mpc'),
valac.find_library('mpc', dirs: vapi_dir)
valac.find_library('mpc', dirs: gcalc_vapi_dir)
]
)
mpfr = declare_dependency(
dependencies: [
cc.find_library('mpfr'),
valac.find_library('mpfr', dirs: vapi_dir)
valac.find_library('mpfr', dirs: gcalc_vapi_dir)
]
)
posix = valac.find_library('posix')
......
......@@ -34,7 +34,10 @@ executable('gnome-calculator-search-provider', search_provider_sources,
link_with: [libcalculator, lib_mpfrg],
install_dir: get_option('libexecdir'),
include_directories: search_provider_includes,
vala_args: search_provider_vala_flags,
vala_args: [
search_provider_vala_flags,
'--vapidir='+gcalc_vapi_dir
],
c_args: search_provider_c_flags,
install: true,
)
......
......@@ -35,6 +35,7 @@ gnome_calculator_vala_flags = [
'--vapidir=' + meson.current_source_dir(),
'--pkg', 'config',
'--gresources', gnome_calculator_resource_files,
'--vapidir='+gcalc_vapi_dir
]
gnome_calculator_c_flags = [
......@@ -76,6 +77,7 @@ gcalccmd_deps = [
gcalccmd_vala_flags = [
'--vapidir=' + meson.current_source_dir(),
'--pkg', 'config',
'--vapidir='+gcalc_vapi_dir
]
gcalccmd_includes = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment