diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-08-02 12:15:57 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-08-02 12:15:57 +0200 |
| commit | 5676f890f19529829cbacf7a42df0d7be53376a3 (patch) | |
| tree | 5566da5550d8b955adec95a0bc693ff614c996a7 | |
| parent | 8a402e61075ab7a9cc10c506e84b877d701719e9 (diff) | |
Add support for build2-aware installation
| -rw-r--r-- | odb/buildfile | 17 | ||||
| -rw-r--r-- | odb/details/build2/config-stub.h | 6 | ||||
| -rw-r--r-- | odb/details/build2/config-vc-stub.h | 6 | ||||
| -rw-r--r-- | odb/version-build2-stub.hxx | 5 |
4 files changed, 27 insertions, 7 deletions
diff --git a/odb/buildfile b/odb/buildfile index 2cc8c38..4b03910 100644 --- a/odb/buildfile +++ b/odb/buildfile @@ -41,21 +41,24 @@ install_include = [dir_path] include/odb/ if ($cxx.target.class != "windows") details/win32/*: install = false -# We want these to be picked up even when LIBODB_BUILD2 is not defined. +# We want these to be picked up whether LIBODB_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/details/build2/config-stub.h b/odb/details/build2/config-stub.h new file mode 100644 index 0000000..60dbd5c --- /dev/null +++ b/odb/details/build2/config-stub.h @@ -0,0 +1,6 @@ +/* file : odb/details/build2/config-stub.h + * copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +#include <odb/details/config.h> diff --git a/odb/details/build2/config-vc-stub.h b/odb/details/build2/config-vc-stub.h new file mode 100644 index 0000000..e107213 --- /dev/null +++ b/odb/details/build2/config-vc-stub.h @@ -0,0 +1,6 @@ +/* file : odb/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/details/config-vc.h> diff --git a/odb/version-build2-stub.hxx b/odb/version-build2-stub.hxx new file mode 100644 index 0000000..9e600ce --- /dev/null +++ b/odb/version-build2-stub.hxx @@ -0,0 +1,5 @@ +// file : odb/version-build2-stub.hxx +// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#include <odb/version.hxx> |