diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2017-08-02 13:58:57 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-08-02 13:58:57 +0300 |
| commit | 3680c8c90cc15ffb5139ef2b3d8bfc001c6329d8 (patch) | |
| tree | a5be8be60ad1f89a3d1f0edba60fdc9cb36f3903 | |
| parent | 814f044c8a0f297a7bfa98b4eaf820d213187d9c (diff) | |
Add support for build2-aware installation
| -rw-r--r-- | odb/pgsql/buildfile | 17 | ||||
| -rw-r--r-- | odb/pgsql/details/build2/config-stub.h | 6 | ||||
| -rw-r--r-- | odb/pgsql/details/build2/config-vc-stub.h | 6 | ||||
| -rw-r--r-- | odb/pgsql/version-build2-stub.hxx | 5 |
4 files changed, 27 insertions, 7 deletions
diff --git a/odb/pgsql/buildfile b/odb/pgsql/buildfile index bd502ad..a2d9147 100644 --- a/odb/pgsql/buildfile +++ b/odb/pgsql/buildfile @@ -60,21 +60,24 @@ install_include = [dir_path] include/odb/pgsql/ {hxx ixx txx}{*}: install = $install_include {hxx ixx txx}{*}: install.subdirs = true -# We want these to be picked up even when LIBODB_PGSQL_BUILD2 is not defined. +# We want these to be picked up whether LIBODB_PGSQL_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/pgsql/details/build2/config-stub.h b/odb/pgsql/details/build2/config-stub.h new file mode 100644 index 0000000..3d7b3bc --- /dev/null +++ b/odb/pgsql/details/build2/config-stub.h @@ -0,0 +1,6 @@ +/* file : odb/pgsql/details/build2/config-stub.h + * copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +#include <odb/pgsql/details/config.h> diff --git a/odb/pgsql/details/build2/config-vc-stub.h b/odb/pgsql/details/build2/config-vc-stub.h new file mode 100644 index 0000000..7e13275 --- /dev/null +++ b/odb/pgsql/details/build2/config-vc-stub.h @@ -0,0 +1,6 @@ +/* file : odb/pgsql/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/pgsql/details/config-vc.h> diff --git a/odb/pgsql/version-build2-stub.hxx b/odb/pgsql/version-build2-stub.hxx new file mode 100644 index 0000000..80d5790 --- /dev/null +++ b/odb/pgsql/version-build2-stub.hxx @@ -0,0 +1,5 @@ +// file : odb/pgsql/version-build2-stub.hxx +// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#include <odb/pgsql/version.hxx> |