From: Daniel Wagner <dwagner@suse.de>
Date: Tue, 12 Oct 2021 15:18:48 +0000 (+0200)
Subject: build: Allow subproject meson builds
X-Git-Tag: v1.0-rc0~83^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d16233c452d8f4f0a4ece120ab0222c3f6975f20;p=users%2Fsagi%2Flibnvme.git

build: Allow subproject meson builds

meson has a very fancy feature called subproject. This allows bundle
third party libraries in a project. In order to be able to use this
for nvme-cli we need to drop all global config settings and declare
all dependencies.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---

diff --git a/meson.build b/meson.build
index 16f950b9..6b4fd777 100644
--- a/meson.build
+++ b/meson.build
@@ -203,8 +203,7 @@ pkg.generate(
 )
 
 ################################################################################
-add_project_arguments('-include', 'config.h', language : 'c')
-add_global_arguments(['-fomit-frame-pointer', '-D_GNU_SOURCE'], language : 'c')
+add_project_arguments(['-fomit-frame-pointer', '-D_GNU_SOURCE', '-include', 'config.h'], language : 'c')
 incdir = include_directories(['.', 'ccan', 'src'])
 
 ################################################################################
diff --git a/src/meson.build b/src/meson.build
index 09da32bf..15949c95 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -51,6 +51,16 @@ libnvme_static = static_library(
     install : false
 )
 
+libnvme_shared_dep = declare_dependency(
+    include_directories: incdir,
+    link_with: libnvme_shared,
+)
+
+libnvme_static_dep = declare_dependency(
+    include_directories: incdir,
+    link_with: libnvme_static,
+)
+
 mode = ['rw-r--r--', 0, 0]
 install_headers('libnvme.h', install_mode: mode)
 install_headers([