diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-10-28 10:27:30 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-10-28 10:27:30 +0200 |
| commit | 729c51710404d9866c92d66928b69fc89070d457 (patch) | |
| tree | 33b7062d88edcd1c3d96942ee0de6412bfb3b190 | |
| parent | 09a77f00412d2547733a7a2c0812455753e915f5 (diff) | |
Introduce interface version for Qt and Boost profiles
This will allow us to make bugfix releases without having to update
ODB compiler binaries, which include these libraries.
| -rw-r--r-- | odb/qt/version.hxx | 10 | ||||
| -rw-r--r-- | odb/qt/version.options | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx index 188ec11..05fbb45 100644 --- a/odb/qt/version.hxx +++ b/odb/qt/version.hxx @@ -33,9 +33,17 @@ # error incompatible odb interface version detected #endif -// libodb-qt version: odb interface version plus the bugfix +// ODB Qt interface version: odb interface version plus the Qt interface // version. // +#define ODB_QT_VERSION 1060000 +#define ODB_QT_VERSION_STR "1.6.0" + +// libodb-qt version: odb interface version plus the bugfix version. Note +// that LIBODB_QT_VERSION is always greater or equal to ODB_QT_VERSION +// since if the Qt interface virsion is incremented then the bugfix version +// must be incremented as well. +// #define LIBODB_QT_VERSION 1060000 #define LIBODB_QT_VERSION_STR "1.6.0" diff --git a/odb/qt/version.options b/odb/qt/version.options index 7a913f3..81c1da2 100644 --- a/odb/qt/version.options +++ b/odb/qt/version.options @@ -4,10 +4,10 @@ # license : GNU GPL v2; see accompanying LICENSE file # Make sure the options files as seen by the ODB compiler and header -# files as seen by the C++ compiler are from the same profile version. +# files as seen by the C++ compiler have the same Qt interface version. # --hxx-prologue '#include <odb/qt/version.hxx>' ---hxx-prologue '#if LIBODB_QT_VERSION != 1060000 // 1.6.0' ---hxx-prologue '# error ODB and C++ compilers see different libodb-qt versions' +--hxx-prologue '#if ODB_QT_VERSION != 1060000 // 1.6.0' +--hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' |