Don't recompile the xmpp account inside the Google account

src/accounts/google/CMakeLists.txt

@@ -0,0 +1,14 @@
+include_directories( ${JREEN_INCLUDE_DIR} )
+
+
+# terrible hack to access ui_XmppConfigWidget.h
+include_directories( ${CMAKE_CURRENT_BINARY_DIR}/../xmpp/ )
+
+tomahawk_add_plugin(google
+    TYPE account
+    EXPORT_MACRO ACCOUNTDLLEXPORT_PRO
+    SOURCES
+        GoogleWrapper.cpp
+    LINK_LIBRARIES
+        tomahawk_account_xmpp
+)

src/accounts/google/GoogleWrapper.cpp

@@ -19,7 +19,7 @@
 
 
 #include "GoogleWrapper.h"
-#include "../XmppConfigWidget.h"
+#include "../xmpp/XmppConfigWidget.h"
 #include "ui_XmppConfigWidget.h"
 
 #include "utils/TomahawkUtilsGui.h"
@@ -121,6 +121,4 @@ GoogleWrapper::sipPlugin()
 }
 
 
-#ifdef GOOGLE_WRAPPER
 Q_EXPORT_PLUGIN2( Tomahawk::Accounts::AccountFactory, Tomahawk::Accounts::GoogleWrapperFactory )
-#endif

src/accounts/google/GoogleWrapper.h

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

src/accounts/xmpp/CMakeLists.txt

@@ -18,6 +18,5 @@ tomahawk_add_plugin(xmpp
     LINK_LIBRARIES
         ${TOMAHAWK_LIBRARIES}
         ${JREEN_LIBRARIES}
+    SHARED_LIB
 )
-
-add_subdirectory(googlewrapper)

src/accounts/xmpp/XmppAccount.cpp

@@ -135,6 +135,4 @@ XmppAccount::sipPlugin()
 
 }
 
-#ifndef GOOGLE_WRAPPER
 Q_EXPORT_PLUGIN2( Tomahawk::Accounts::AccountFactory, Tomahawk::Accounts::XmppAccountFactory )
-#endif

src/accounts/xmpp/XmppAccount.h

@@ -25,6 +25,7 @@
 #include "sip/XmppSip.h"
 #include "accounts/AccountDllMacro.h"
 #include "accounts/Account.h"
+#include "accounts/AccountConfigWidget.h"
 
 #define MYNAME "ACCOUNTJABBER"
 

src/accounts/xmpp/googlewrapper/CMakeLists.txt

@@ -1,21 +0,0 @@
-include_directories( ${JREEN_INCLUDE_DIR} )
-
-tomahawk_add_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
-)