From 8771fd6f0e261aa8d1e95e05da6aa987edd6fce5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 9 Apr 2013 11:35:02 +0200 Subject: [PATCH] Define QXT_STATIC in header so that parent projects use it. --- thirdparty/qxt/qxtweb-standalone/CMakeLists.txt | 2 +- thirdparty/qxt/qxtweb-standalone/core/qxtglobal.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt index 6375e2dcc..699c7bfc4 100644 --- a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt +++ b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt @@ -15,7 +15,7 @@ ADD_DEFINITIONS( -Wall -O2 -DNDEBUG ) IF( NOT WIN32 ) ADD_DEFINITIONS( -fPIC ) ENDIF() -ADD_DEFINITIONS( -DBUILD_QXT_CORE -DBUILD_QXT_WEB -DQXT_STATIC ) +ADD_DEFINITIONS( -DBUILD_QXT_CORE -DBUILD_QXT_WEB ) INCLUDE_DIRECTORIES( ${qxtweb} ${qxtcore} ${qxtnet} ) diff --git a/thirdparty/qxt/qxtweb-standalone/core/qxtglobal.h b/thirdparty/qxt/qxtweb-standalone/core/qxtglobal.h index 7d5abfbe0..c807a81dd 100644 --- a/thirdparty/qxt/qxtweb-standalone/core/qxtglobal.h +++ b/thirdparty/qxt/qxtweb-standalone/core/qxtglobal.h @@ -51,6 +51,9 @@ #define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE +// Define QXT_STATIC here so that the linker of projects that include the static library use the correct call method. +#define QXT_STATIC + #if !defined(QXT_STATIC) && !defined(QXT_DOXYGEN_RUN) # if defined(BUILD_QXT_CORE) # define QXT_CORE_EXPORT Q_DECL_EXPORT