From a19e3164588d80a36b0374e36d7993d12a170f2f Mon Sep 17 00:00:00 2001 From: Mark Meredith Date: Thu, 4 Jun 2020 09:23:43 -0400 Subject: [PATCH 1/2] Declare dependency --- meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index a2fbacd..4eb9021 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,8 @@ project('mfix-parser', 'cpp', version : '0.1', default_options : ['warning_level=3', 'cpp_std=c++2a']) -run_command('conan', 'install', '--install-folder', meson.build_root(), meson.source_root(), check: true) +run_command('conan', 'install', '--install-folder', meson.build_root(), + meson.current_source_dir(), check: true) pegtl = dependency('pegtl', method: 'pkg-config') catch2 = dependency('catch2', method: 'pkg-config') @@ -12,3 +13,8 @@ parser_inc = include_directories('include', 'src') subdir('src/csg') subdir('src/inputs') + +parser_dep = declare_dependency( + include_directories: parser_inc, + dependencies: [cgal], +) -- GitLab From 45d61683a8ebf0d51212036f4109bf41b1742b9a Mon Sep 17 00:00:00 2001 From: Mark Meredith Date: Thu, 4 Jun 2020 10:25:10 -0400 Subject: [PATCH 2/2] link_with --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index 4eb9021..55dede9 100644 --- a/meson.build +++ b/meson.build @@ -16,5 +16,6 @@ subdir('src/inputs') parser_dep = declare_dependency( include_directories: parser_inc, + link_with: [lib_csg_parser, lib_inputs_parser], dependencies: [cgal], ) -- GitLab