From 6d92d158bb5f93a196e6c3821e07e4ee6d980ff4 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Thu, 24 Mar 2011 15:54:57 -0400
Subject: [PATCH] Have proper visibility of the libraries instead of assuming
it's only needed on WIN32
---
src/libtomahawk/dllmacro.h | 16 ++++++++--------
thirdparty/qtweetlib/CMakeLists.txt | 4 +---
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/libtomahawk/dllmacro.h b/src/libtomahawk/dllmacro.h
index 550047539..55a2b6ab9 100644
--- a/src/libtomahawk/dllmacro.h
+++ b/src/libtomahawk/dllmacro.h
@@ -19,14 +19,14 @@
#ifndef DLLMACRO_H
#define DLLMACRO_H
-#ifdef WIN32
- #ifdef DLLEXPORT_PRO
- #define DLLEXPORT __declspec(dllexport)
- #else
- #define DLLEXPORT __declspec(dllimport)
- #endif
-#else
- #define DLLEXPORT
+#include <QtCore/qglobal.h>
+
+#ifndef DLLEXPORT
+# if defined (DLLEXPORT_PRO)
+# define DLLEXPORT Q_DECL_EXPORT
+# else
+# define DLLEXPORT Q_DECL_IMPORT
+# endif
#endif
#endif
diff --git a/thirdparty/qtweetlib/CMakeLists.txt b/thirdparty/qtweetlib/CMakeLists.txt
index c68f22031..820b950b4 100644
--- a/thirdparty/qtweetlib/CMakeLists.txt
+++ b/thirdparty/qtweetlib/CMakeLists.txt
@@ -9,10 +9,10 @@ INCLUDE( ${QT_USE_FILE} )
add_definitions( ${QT_DEFINITIONS} )
add_definitions( -DQT_SHARED )
+add_definitions( -DQTWEETLIB_MAKEDLL )
if(WIN32)
set(PLATFORM_SPECIFIC_LIBS "ws2_32.dll" "advapi32.dll" )
- add_definitions( -DQTWEETLIB_MAKEDLL )
endif(WIN32)
set(TOMAHAWK_QTWEETLIB_SOURCES
@@ -176,8 +176,6 @@ target_link_libraries(tomahawk_qtweetlib
qjson
)
-#SET_TARGET_PROPERTIES( tomahawk_qtweetlib PROPERTIES DEFINE_SYMBOL MAKE_QTWEETLIB_LIB )
-
INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys )
INSTALL(TARGETS tomahawk_qtweetlib DESTINATION lib${LIB_SUFFIX})