From 6b61bd245870bad80a2655ea4c4b56d1246233df Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 6 May 2024 06:33:36 +0200
Subject: Add libbutl-odb source subdirectory

This is an additional (to libbutl) utility library which contains the source
code of libodb, libodb-sqlite, and libsqlite3 configured and tuned for our
needs.
---
 build/export.build | 18 +++++++++++++++---
 build/root.build   | 17 +++++++++++++++--
 2 files changed, 30 insertions(+), 5 deletions(-)

(limited to 'build')

diff --git a/build/export.build b/build/export.build
index 427f76b..5f921cb 100644
--- a/build/export.build
+++ b/build/export.build
@@ -1,9 +1,21 @@
 # file      : build/export.build
 # license   : MIT; see accompanying LICENSE file
 
-$out_root/
+if ($name($import.target) == 'butl-odb')
 {
-  include libbutl/
+  $out_root/
+  {
+    include libbutl-odb/
+  }
+
+  export $out_root/libbutl-odb/$import.target
 }
+else
+{
+  $out_root/
+  {
+    include libbutl/
+  }
 
-export $out_root/libbutl/lib{butl}
+  export $out_root/libbutl/$import.target
+}
diff --git a/build/root.build b/build/root.build
index 17e42b1..274b23b 100644
--- a/build/root.build
+++ b/build/root.build
@@ -1,9 +1,22 @@
 # file      : build/root.build
 # license   : MIT; see accompanying LICENSE file
 
+# Ability to build with system libsqlite3.
+#
+# Note that unless libsqlite3 on your system was built with an increased
+# SQLITE_MAX_ATTACHED value (the default is 10), you will most likely come to
+# regret using the system version.
+#
+# Also, while most distributions have to build libsqlite3 in a multi-threaded
+# configuration, we build it single-threaded (and with disabled shared cache
+# support), which gives us a non-negligible performance boost.
+#
+config [bool, config.report=false] config.libbutl.system_libsqlite3 ?= false
+
 cxx.std = latest
 
 using cxx
+using c
 
 hxx{*}: extension = hxx
 ixx{*}: extension = ixx
@@ -11,10 +24,10 @@ txx{*}: extension = txx
 cxx{*}: extension = cxx
 
 if ($cxx.target.system == 'win32-msvc')
-  cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+  cc.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
 
 if ($cxx.class == 'msvc')
-  cxx.coptions += /wd4251 /wd4275 /wd4800
+  cc.coptions += /wd4251 /wd4275 /wd4800
 elif ($cxx.id == 'gcc')
 {
   # See GCC bugs 100115, 98753 (attachment 50081/comment 15), and 101361. Note
-- 
cgit v1.1