diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2019-02-18 13:01:12 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-02-18 13:01:12 +0200 |
commit | af50e2603fd0f877d0f96da1562b0deda0590b70 (patch) | |
tree | c81af5e2565aca994aaf37b0bf6694c50cb52eee /odb/qt/details | |
parent | d72ebf3ae3a638cefd8b11ae897eb491a19cac12 (diff) |
Add support for building with build2
Diffstat (limited to 'odb/qt/details')
-rw-r--r-- | odb/qt/details/build2/config-stub.h | 6 | ||||
-rw-r--r-- | odb/qt/details/build2/config-vc-stub.h | 6 | ||||
-rw-r--r-- | odb/qt/details/build2/config-vc.h | 16 | ||||
-rw-r--r-- | odb/qt/details/build2/config.h | 18 | ||||
-rw-r--r-- | odb/qt/details/config-vc.h | 6 | ||||
-rw-r--r-- | odb/qt/details/config.hxx | 11 | ||||
-rw-r--r-- | odb/qt/details/export.hxx | 39 |
7 files changed, 98 insertions, 4 deletions
diff --git a/odb/qt/details/build2/config-stub.h b/odb/qt/details/build2/config-stub.h new file mode 100644 index 0000000..7d724a4 --- /dev/null +++ b/odb/qt/details/build2/config-stub.h @@ -0,0 +1,6 @@ +/* file : odb/qt/details/build2/config-stub.h + * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +#include <odb/qt/details/config.h> diff --git a/odb/qt/details/build2/config-vc-stub.h b/odb/qt/details/build2/config-vc-stub.h new file mode 100644 index 0000000..c4051f8 --- /dev/null +++ b/odb/qt/details/build2/config-vc-stub.h @@ -0,0 +1,6 @@ +/* file : odb/qt/details/build2/config-vc-stub.h + * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +#include <odb/qt/details/config-vc.h> diff --git a/odb/qt/details/build2/config-vc.h b/odb/qt/details/build2/config-vc.h new file mode 100644 index 0000000..43f7d6a --- /dev/null +++ b/odb/qt/details/build2/config-vc.h @@ -0,0 +1,16 @@ +/* file : odb/qt/details/build2/config-vc.h + * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Configuration file for Windows/VC++ for the build2 build. */ + +#ifndef ODB_QT_DETAILS_CONFIG_VC_H +#define ODB_QT_DETAILS_CONFIG_VC_H + +/* Define LIBODB_QT_BUILD2 for the installed case. */ +#ifndef LIBODB_QT_BUILD2 +# define LIBODB_QT_BUILD2 +#endif + +#endif /* ODB_QT_DETAILS_CONFIG_VC_H */ diff --git a/odb/qt/details/build2/config.h b/odb/qt/details/build2/config.h new file mode 100644 index 0000000..a864e08 --- /dev/null +++ b/odb/qt/details/build2/config.h @@ -0,0 +1,18 @@ +/* file : odb/qt/details/build2/config.h + * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Static configuration file for the build2 build. The installed case + (when LIBODB_QT_BUILD2 is not necessarily defined) is the only + reason we have it. */ + +#ifndef ODB_QT_DETAILS_CONFIG_H +#define ODB_QT_DETAILS_CONFIG_H + +/* Define LIBODB_QT_BUILD2 for the installed case. */ +#ifndef LIBODB_QT_BUILD2 +# define LIBODB_QT_BUILD2 +#endif + +#endif /* ODB_QT_DETAILS_CONFIG_H */ diff --git a/odb/qt/details/config-vc.h b/odb/qt/details/config-vc.h new file mode 100644 index 0000000..db08247 --- /dev/null +++ b/odb/qt/details/config-vc.h @@ -0,0 +1,6 @@ +/* file : odb/qt/details/config-vc.h + * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* Dummy configuration file for Windows/VC++. */ diff --git a/odb/qt/details/config.hxx b/odb/qt/details/config.hxx index dbc4346..08030bd 100644 --- a/odb/qt/details/config.hxx +++ b/odb/qt/details/config.hxx @@ -7,8 +7,6 @@ // no pre -#ifdef _MSC_VER -#elif defined(ODB_COMPILER) // Qt5 may complain if we are building without -fPIC. Instead of asking the // user to pass one of these options to the ODB compiler (which can, BTW, be // done with -x -fPIC, for example, if one is not using the Qt profile), we @@ -20,6 +18,7 @@ // directly. This file appears to be present in all the versions starting with // Qt 4.0. // +#ifdef ODB_COMPILER # if defined(__ELF__) && !defined(__PIC__) # include <QtCore/qconfig.h> // QT_REDUCE_RELOCATIONS # ifdef QT_REDUCE_RELOCATIONS @@ -27,8 +26,12 @@ # endif # endif # define LIBODB_QT_STATIC_LIB -#else -# include <odb/qt/details/config.h> +#elif !defined(LIBODB_QT_BUILD2) +# ifdef _MSC_VER +# include <odb/qt/details/config-vc.h> +# else +# include <odb/qt/details/config.h> +# endif #endif // no post diff --git a/odb/qt/details/export.hxx b/odb/qt/details/export.hxx index 51bf1f4..9b93df5 100644 --- a/odb/qt/details/export.hxx +++ b/odb/qt/details/export.hxx @@ -9,6 +9,43 @@ #include <odb/qt/details/config.hxx> +// Normally we don't export class templates (but do complete specializations), +// inline functions, and classes with only inline member functions. Exporting +// classes that inherit from non-exported/imported bases (e.g., std::string) +// will end up badly. The only known workarounds are to not inherit or to not +// export. Also, MinGW GCC doesn't like seeing non-exported function being +// used before their inline definition. The workaround is to reorder code. In +// the end it's all trial and error. + +#ifdef LIBODB_QT_BUILD2 + +#if defined(LIBODB_QT_STATIC) // Using static. +# define LIBODB_QT_EXPORT +#elif defined(LIBODB_QT_STATIC_BUILD) // Building static. +# define LIBODB_QT_EXPORT +#elif defined(LIBODB_QT_SHARED) // Using shared. +# ifdef _WIN32 +# define LIBODB_QT_EXPORT __declspec(dllimport) +# else +# define LIBODB_QT_EXPORT +# endif +#elif defined(LIBODB_QT_SHARED_BUILD) // Building shared. +# ifdef _WIN32 +# define LIBODB_QT_EXPORT __declspec(dllexport) +# else +# define LIBODB_QT_EXPORT +# endif +#else +// If none of the above macros are defined, then we assume we are being used +// by some third-party build system that cannot/doesn't signal the library +// type. Note that this fallback works for both static and shared but in case +// of shared will be sub-optimal compared to having dllimport. +// +# define LIBODB_QT_EXPORT // Using static or shared. +#endif + +#else // LIBODB_QT_BUILD2 + #ifdef LIBODB_QT_STATIC_LIB # define LIBODB_QT_EXPORT #else @@ -35,6 +72,8 @@ # endif #endif +#endif // LIBODB_QT_BUILD2 + #include <odb/post.hxx> #endif // ODB_QT_DETAILS_EXPORT_HXX |