diff options
| author | Leonardo Basilio <leobasilio@gmail.com> | 2020-05-18 17:18:47 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 22:18:47 +0200 |
| commit | 2ba4d793321c7197b3b4d1ce2f67021a5a087e3f (patch) | |
| tree | cf6a9ec93d349bfa7d2a391b27111f768c490215 /src | |
| parent | fe83e9c3d42c3becf682e2b5ecfc9d77b24c614f (diff) | |
| download | qxmpp-2ba4d793321c7197b3b4d1ce2f67021a5a087e3f.tar.gz | |
QXmppGlobal: Fix QXMPP_EXPORT define for static linking (#299)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/base/QXmppGlobal.h.in | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fda58aed..6abfdba5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,6 +9,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/base) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/client) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/server) +# Configure QXmppGlobal.h.in +if(BUILD_SHARED) + set(QXMPP_BUILD_SHARED true) +else() + set(QXMPP_BUILD_SHARED false) +endif() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/base/QXmppGlobal.h.in ${CMAKE_CURRENT_BINARY_DIR}/base/QXmppGlobal.h @ONLY) include_directories(${CMAKE_CURRENT_BINARY_DIR}/base) diff --git a/src/base/QXmppGlobal.h.in b/src/base/QXmppGlobal.h.in index a4860d06..29570dd7 100644 --- a/src/base/QXmppGlobal.h.in +++ b/src/base/QXmppGlobal.h.in @@ -29,10 +29,16 @@ #include <QString> -#if defined(QXMPP_BUILD) -# define QXMPP_EXPORT Q_DECL_EXPORT +#define QXMPP_BUILD_SHARED @QXMPP_BUILD_SHARED@ + +#if QXMPP_BUILD_SHARED +# if defined(QXMPP_BUILD) +# define QXMPP_EXPORT Q_DECL_EXPORT +# else +# define QXMPP_EXPORT Q_DECL_IMPORT +# endif #else -# define QXMPP_EXPORT Q_DECL_IMPORT +# define QXMPP_EXPORT #endif #define QXMPP_AUTOTEST_EXPORT |