From a6d4f76e645c979b01d222ffd5f8644c3b1b0d7a Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Mon, 29 Apr 2024 15:27:54 +0200
Subject: [PATCH] fixup! add meson build

---
 example/meson.build | 6 +++---
 ioc/meson.build     | 1 +
 meson.build         | 3 +++
 src/meson.build     | 1 +
 test/meson.build    | 8 ++++----
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/example/meson.build b/example/meson.build
index 5c2cb80bd..d122af523 100644
--- a/example/meson.build
+++ b/example/meson.build
@@ -1,4 +1,4 @@
-foreach t : [
+foreach e : [
     ['simplesrv', ['./simplesrv.cpp']],
     ['mailbox', ['./mailbox.cpp']],
     ['ticker', ['./ticker.cpp']],
@@ -8,8 +8,8 @@ foreach t : [
     ['rpc_client', ['./rpc_client.cpp']],
   ]
   executable(
-    t[0],
-    t[1],
+    e[0],
+    e[1],
     dependencies: [epics_base, libCom, pvxs_dep],
   )
 endforeach
diff --git a/ioc/meson.build b/ioc/meson.build
index 79703f1e8..d86a5f3f5 100644
--- a/ioc/meson.build
+++ b/ioc/meson.build
@@ -5,6 +5,7 @@ libpvxsIoc = library(
   ['./iochooks.cpp'],
   cpp_args: ['-DPVXS_IOC_API_BUILDING'],
   dependencies: [epics_base, libCom, pvxs_dep],
+  version: meson.project_version(),
   install: true,
   install_dir: lib_install_dir,
   # HACK: Workaround https://github.com/mesonbuild/meson/issues/6541
diff --git a/meson.build b/meson.build
index a40ac0993..f8d2cf2bb 100644
--- a/meson.build
+++ b/meson.build
@@ -4,6 +4,9 @@ project(
   version: '1.1.2',
   license: 'EPICS',
   # license_files: './LICENSE',
+  default_options: [
+    'default_library=both',
+  ],
 )
 
 # Build Machine as in Autotools terminology: the machine that will build
diff --git a/src/meson.build b/src/meson.build
index 083d4fe5f..e170345ae 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -88,6 +88,7 @@ libpvxs = library(
   ],
   cpp_args: ['-DPVXS_API_BUILDING', '-DPVXS_ENABLE_EXPERT_API'],
   dependencies: [epics_base, libCom, libevent],
+  version: meson.project_version(),
   install: true,
   install_dir: lib_install_dir,
   # HACK: Workaround https://github.com/mesonbuild/meson/issues/6541
diff --git a/test/meson.build b/test/meson.build
index 5572c7d48..929364885 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -48,14 +48,14 @@ if epics_version[0] == '7' and epics_version[1] == '0'
 endif
 
 # Development utilities, not tests
-foreach t : [
+foreach e : [
     ['mcat', ['./mcat.cpp']],
     ['spam', ['./spam.cpp']],
     ['eatspam', ['./eatspam.cpp']],
   ]
-  test = executable(
-    t[0],
-    t[1],
+  executable(
+    e[0],
+    e[1],
     dependencies: [epics_base, libCom, pvxs_dep],
   )
 endforeach