commit ee53ad33323285955f23a7ef9ab8daa18c3c76b8
author William A. Kennington III <wak@google.com> Thu Jul 14 16:14:31 2022 -0700
committer William A. Kennington III <wak@google.com> Thu Jul 21 03:29:56 2022 +0000
tree bd67d396cafa79fc7f79f3cf0266e99801dafe9f
parent 2030ea51264d1417883a529ba1eeea95a8187d96

io_uring: Separate from primary library

This makes it possible to exclude the functionality at runtime if not
used by any binaries on a system.

Change-Id: I4458938f3573b6b8c9898c25552d34f590e6890b
Signed-off-by: William A. Kennington III <wak@google.com>

include-uring/meson.build

diff --git a/include-uring/meson.build b/include-uring/meson.build
index 91b426f..e30432d 100644
--- a/include-uring/meson.build
+++ b/include-uring/meson.build
@@ -1,4 +1,4 @@
-stdplus_headers += include_directories('.')
+stdplus_io_uring_headers = include_directories('.')
 
 install_headers(
   'stdplus/io_uring.hpp',

src/meson.build

diff --git a/src/meson.build b/src/meson.build
index 0b6be99..34c3674 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -43,16 +43,6 @@
   ]
 endif
 
-if has_io_uring
-  stdplus_deps += [
-    io_uring_dep,
-  ]
-
-  stdplus_srcs += [
-    'io_uring.cpp',
-  ]
-endif
-
 stdplus_lib = library(
   'stdplus',
   stdplus_srcs,
@@ -103,14 +93,40 @@
 endif
 
 if has_io_uring
-  stdplus_io_uring_dep = stdplus_dep
+  stdplus_io_uring_deps = [
+    stdplus_dep,
+    stdplus_fd_dep,
+    io_uring_dep,
+  ]
+
+  stdplus_io_uring_pre = declare_dependency(
+    include_directories: stdplus_io_uring_headers,
+    dependencies: stdplus_io_uring_deps)
+
+  stdplus_io_uring_lib = library(
+    'stdplus-io_uring',
+    'io_uring.cpp',
+    dependencies: stdplus_io_uring_pre,
+    implicit_include_directories: false,
+    version: meson.project_version(),
+    install: true)
+
+  stdplus_io_uring_dep = declare_dependency(
+    dependencies: stdplus_io_uring_pre,
+    link_with: stdplus_io_uring_lib)
+
+  stdplus_io_uring_reqs = []
+  foreach dep : stdplus_io_uring_deps
+    if dep.type_name() == 'pkgconfig'
+      stdplus_io_uring_reqs += dep
+    endif
+  endforeach
 
   import('pkgconfig').generate(
-    stdplus_lib,
-    name: 'stdplus-io_uring',
+    stdplus_io_uring_lib,
     description: 'C++ helper utilities',
     version: meson.project_version(),
-    requires: stdplus_reqs)
+    requires: stdplus_io_uring_reqs)
 endif
 
 if has_gtest