aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-08-02 13:59:32 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-08-02 13:59:32 +0300
commit839ce3f20206dcdc0e2c1ab04f9a40bad0b87302 (patch)
treee600aa8ff23dd1b83ea89bfe6c10f5e17ea205a3
parentea23ae9eb7f5fe7badda1c3341070b58f1f31dd4 (diff)
Add support for build2-aware installation
-rw-r--r--odb/sqlite/buildfile17
-rw-r--r--odb/sqlite/details/build2/config-stub.h6
-rw-r--r--odb/sqlite/details/build2/config-vc-stub.h6
-rw-r--r--odb/sqlite/version-build2-stub.hxx5
4 files changed, 27 insertions, 7 deletions
diff --git a/odb/sqlite/buildfile b/odb/sqlite/buildfile
index f225a64..047f209 100644
--- a/odb/sqlite/buildfile
+++ b/odb/sqlite/buildfile
@@ -60,21 +60,24 @@ install_include = [dir_path] include/odb/sqlite/
{hxx ixx txx}{*}: install = $install_include
{hxx ixx txx}{*}: install.subdirs = true
-# We want these to be picked up even when LIBODB_SQLITE_BUILD2 is not defined.
+# We want these to be picked up whether LIBODB_SQLITE_BUILD2 is defined or not.
#
-hxx{version}@./: install = false
-hxx{version-build2}: install = $install_include/version.hxx
+hxx{version}@./: install = false
+hxx{version-build2}: install = $install_include/version.hxx
+hxx{version-build2-stub}@./: install = $install_include/version-build2.hxx
details/build2/:
{
+ h{*}: install = false
+
if ($cxx.id == "msvc")
{
- h{config}@./: install = false
- h{config-vc}@./: install = $install_include/details/
+ h{config-vc}@./: install = $install_include/details/
+ h{config-vc-stub}@./: install = $install_include/details/build2/config-vc.h
}
else
{
- h{config}@./: install = $install_include/details/
- h{config-vc}@./: install = false
+ h{config}@./: install = $install_include/details/
+ h{config-stub}@./: install = $install_include/details/build2/config.h
}
}
diff --git a/odb/sqlite/details/build2/config-stub.h b/odb/sqlite/details/build2/config-stub.h
new file mode 100644
index 0000000..3777383
--- /dev/null
+++ b/odb/sqlite/details/build2/config-stub.h
@@ -0,0 +1,6 @@
+/* file : odb/sqlite/details/build2/config-stub.h
+ * copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
+ * license : GNU GPL v2; see accompanying LICENSE file
+ */
+
+#include <odb/sqlite/details/config.h>
diff --git a/odb/sqlite/details/build2/config-vc-stub.h b/odb/sqlite/details/build2/config-vc-stub.h
new file mode 100644
index 0000000..2499c76
--- /dev/null
+++ b/odb/sqlite/details/build2/config-vc-stub.h
@@ -0,0 +1,6 @@
+/* file : odb/sqlite/details/build2/config-vc-stub.h
+ * copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
+ * license : GNU GPL v2; see accompanying LICENSE file
+ */
+
+#include <odb/sqlite/details/config-vc.h>
diff --git a/odb/sqlite/version-build2-stub.hxx b/odb/sqlite/version-build2-stub.hxx
new file mode 100644
index 0000000..437b309
--- /dev/null
+++ b/odb/sqlite/version-build2-stub.hxx
@@ -0,0 +1,5 @@
+// file : odb/sqlite/version-build2-stub.hxx
+// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC
+// license : GNU GPL v2; see accompanying LICENSE file
+
+#include <odb/sqlite/version.hxx>