From b16d41810232718440209eb6d06010a2b59f47aa Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Fri, 11 Jan 2013 10:27:59 +0100 Subject: [PATCH] fixed windows build --- .../qxt/qxtweb-standalone/CMakeLists.txt | 24 ++++--------------- .../qxt/qxtweb-standalone/qxtweb/qxtglobal.h | 2 ++ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt index 43bfc48e9..1b4b42de3 100644 --- a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt +++ b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt @@ -58,25 +58,11 @@ SET( sources ) -# DLL on windows due to linker issues, otherwise static -IF(WIN32) - ADD_LIBRARY(qxtweb-standalone SHARED - ${mocstuff} - ${headers} - ${sources} - ) - INSTALL( TARGETS qxtweb-standalone - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - ) -ELSE() - ADD_LIBRARY(qxtweb-standalone STATIC - ${mocstuff} - ${headers} - ${sources} - ) -ENDIF() +ADD_LIBRARY(qxtweb-standalone STATIC + ${mocstuff} + ${headers} + ${sources} +) target_link_libraries( qxtweb-standalone diff --git a/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtglobal.h b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtglobal.h index 7d5abfbe0..fa5921816 100644 --- a/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtglobal.h +++ b/thirdparty/qxt/qxtweb-standalone/qxtweb/qxtglobal.h @@ -51,6 +51,8 @@ #define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE +#define QXT_STATIC + #if !defined(QXT_STATIC) && !defined(QXT_DOXYGEN_RUN) # if defined(BUILD_QXT_CORE) # define QXT_CORE_EXPORT Q_DECL_EXPORT