add_tomahawk_plugin: port googlewrapper account

CMakeModules/AddTomahawkPlugin.cmake

@@ -40,7 +40,7 @@ ENDMACRO(CDR)
 
 macro(add_tomahawk_plugin)
     parse_arguments(PLUGIN
-        "SOURCES;UI;LINK_LIBRARIES;TYPE;EXPORT_MACRO"
+        "SOURCES;UI;LINK_LIBRARIES;TYPE;EXPORT_MACRO;COMPILE_DEFINITIONS"
         "NO_INSTALL"
         ${ARGN}
         )
@@ -64,18 +64,17 @@ macro(add_tomahawk_plugin)
     endif()
 
     # we should do this more granular to reduce binary sizes
-    qt4_add_resources(PLUGIN_RC_SOURCES "resources.qrc")
-    list(APPEND PLUGIN_SOURCES ${PLUGIN_RC_SOURCES})
+    qt4_add_resources(PLUGIN_SOURCES "resources.qrc")
 
     # add target
     add_library(${target} MODULE ${PLUGIN_SOURCES})
 
     # definitions - can this be moved into set_target_properties below?
     add_definitions(${QT_DEFINITIONS})
-    set_target_properties(${target} PROPERTIES
-        AUTOMOC TRUE
-        COMPILE_DEFINITIONS ${PLUGIN_EXPORT_MACRO}
-    )
+    set_target_properties(${target} PROPERTIES AUTOMOC TRUE COMPILE_DEFINITIONS ${PLUGIN_EXPORT_MACRO})
+    if(PLUGIN_COMPILE_DEFINITIONS)
+        set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${PLUGIN_COMPILE_DEFINITIONS})
+    endif()
 
     # add link targets
     if(PLUGIN_LINK_LIBRARIES)

src/accounts/xmpp/googlewrapper/CMakeLists.txt

@@ -1,41 +1,21 @@
-
-# fake google plugin
-
-set( googleHeaders
-    ../XmppAccount.h
-    ../XmppConfigWidget.h
-    ../sip/XmppSip.h
-    ../sip/AvatarManager.h
-    ../sip/XmlConsole.h
-    ../XmppInfoPlugin.h
-    GoogleWrapper.h )
-
-set( googleSources
-    ../XmppAccount.cpp
-    ../XmppConfigWidget.cpp
-    ../sip/XmppSip.cpp
-    ../sip/TomahawkXmppMessage.cpp
-    ../sip/TomahawkXmppMessageFactory.cpp
-    ../sip/AvatarManager.cpp
-    ../sip/XmlConsole.cpp
-    ../XmppInfoPlugin.cpp
-
-    GoogleWrapper.cpp )
-
-add_definitions(-DGOOGLE_WRAPPER)
-
-qt4_add_resources( RCX_SRCS "resources.qrc" )
-
-qt4_wrap_cpp( googleMoc ${googleHeaders} )
-add_library( tomahawk_account_google SHARED ${googleSources} ${googleMoc} ${googleMoc} ${RCX_SRCS} )
-
 include_directories( ${JREEN_INCLUDE_DIR} )
 
-target_link_libraries( tomahawk_account_google
-    ${QT_LIBRARIES}
-    ${JREEN_LIBRARIES}
-    ${OS_SPECIFIC_LINK_LIBRARIES}
-    tomahawklib
+add_tomahawk_plugin(google
+    TYPE account
+    EXPORT_MACRO ACCOUNTDLLEXPORT_PRO
+    SOURCES
+        ../XmppAccount.cpp
+        ../XmppConfigWidget.cpp
+        ../sip/XmppSip.cpp
+        ../sip/TomahawkXmppMessage.cpp
+        ../sip/TomahawkXmppMessageFactory.cpp
+        ../sip/AvatarManager.cpp
+        ../sip/XmlConsole.cpp
+        ../XmppInfoPlugin.cpp
+        GoogleWrapper.cpp
+    LINK_LIBRARIES
+        ${TOMAHAWK_LIBRARIES}
+        ${JREEN_LIBRARIES}
+    COMPILE_DEFINITIONS
+        GOOGLE_WRAPPER
 )
-
-install( TARGETS tomahawk_account_google DESTINATION ${CMAKE_INSTALL_LIBDIR} )

src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp

@@ -19,7 +19,7 @@
 
 
 #include "GoogleWrapper.h"
-#include "XmppConfigWidget.h"
+#include "../XmppConfigWidget.h"
 #include "ui_XmppConfigWidget.h"
 
 #include "utils/TomahawkUtilsGui.h"

src/accounts/xmpp/googlewrapper/GoogleWrapper.h

@@ -20,7 +20,7 @@
 #ifndef GOOGLEWRAPPER_H
 #define GOOGLEWRAPPER_H
 
-#include "XmppAccount.h"
+#include "../XmppAccount.h"
 
 namespace Tomahawk
 {