Adjust cmake to build again and fix include errors

These are partly hacks - I split the commit for referencing the hacks afterwards
2025-04-22 08:52:12 +02:00 · 2013-05-24 11:23:22 +02:00 · 2013-05-24 11:23:22 +02:00 · a0738ccd76
commit a0738ccd76
parent 4a443bfb9f
20 changed files with 52 additions and 35 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -310,7 +310,6 @@ SET( TOMAHAWK_LIBRARIES tomahawklib )

 ADD_SUBDIRECTORY( thirdparty )
 ADD_SUBDIRECTORY( src )
-ADD_SUBDIRECTORY( src/libtomahawk )
 ADD_SUBDIRECTORY( admin )

 if( BUILD_TESTS )
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -0,0 +1,13 @@
+setup_qt()
+
+add_subdirectory( libtomahawk )
+
+include_directories( ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk )
+include_directories( ${CMAKE_CURRENT_LIST_DIR}/libtomahawk )
+
+add_subdirectory( tomahawk )
+
+add_subdirectory( breakpad/CrashReporter/ )
+
+add_subdirectory( accounts )
+add_subdirectory( infoplugins )
--- a/src/accounts/twitter/TwitterAccount.cpp
+++ b/src/accounts/twitter/TwitterAccount.cpp
@ -20,8 +20,8 @@

 #include "TwitterAccount.h"
 #include "TwitterConfigWidget.h"
-#include "accounts/twitter/TomahawkOAuthTwitter.h"
-#include "libtomahawk/infosystem/InfoSystem.h"
+#include "TomahawkOAuthTwitter.h"
+#include "infosystem/InfoSystem.h"
 #include "utils/Logger.h"
 #include "sip/SipPlugin.h"

--- a/src/accounts/twitter/TwitterInfoPlugin.cpp
+++ b/src/accounts/twitter/TwitterInfoPlugin.cpp
@ -20,7 +20,7 @@

 #include "TwitterInfoPlugin.h"

-#include "accounts/twitter/TwitterAccount.h"
+#include "TwitterAccount.h"

 #include "GlobalActionManager.h"
 #include "utils/Logger.h"
--- a/src/accounts/twitter/TwitterInfoPlugin.h
+++ b/src/accounts/twitter/TwitterInfoPlugin.h
@ -21,7 +21,7 @@
 #define TWITTERINFOPLUGIN_H

 #include "infosystem/InfoSystem.h"
-#include "accounts/twitter/TomahawkOAuthTwitter.h"
+#include "TomahawkOAuthTwitter.h"

 #include <QTweetLib/qtweetuser.h>
 #include <QTweetLib/qtweetstatus.h>
--- a/src/infoplugins/generic/charts/ChartsPlugin.h
+++ b/src/infoplugins/generic/charts/ChartsPlugin.h
@ -20,7 +20,8 @@
 #ifndef ChartsPlugin_H
 #define ChartsPlugin_H

-#include "infoplugins/InfoPluginDllMacro.h"
+#include "../../InfoPluginDllMacro.h"
+
 #include "infosystem/InfoSystem.h"
 #include "infosystem/InfoSystemWorker.h"
 #include <QNetworkReply>
--- a/src/infoplugins/generic/discogs/DiscogsPlugin.h
+++ b/src/infoplugins/generic/discogs/DiscogsPlugin.h
@ -22,7 +22,8 @@
 #include "Typedefs.h"
 #include "infosystem/InfoSystem.h"
 #include "infosystem/InfoSystemWorker.h"
-#include "infoplugins/InfoPluginDllMacro.h"
+
+#include "../../InfoPluginDllMacro.h"

 class QNetworkReply;

--- a/src/infoplugins/generic/echonest/EchonestPlugin.h
+++ b/src/infoplugins/generic/echonest/EchonestPlugin.h
@ -20,7 +20,8 @@
 #ifndef ECHONESTPLUGIN_H
 #define ECHONESTPLUGIN_H

-#include "infoplugins/InfoPluginDllMacro.h"
+#include "../../InfoPluginDllMacro.h"
+
 #include "infosystem/InfoSystem.h"
 #include "infosystem/InfoSystemWorker.h"
 #include "echonest/Artist.h"
--- a/src/infoplugins/generic/hypem/HypemPlugin.h
+++ b/src/infoplugins/generic/hypem/HypemPlugin.h
@ -20,7 +20,8 @@
 #ifndef HYPEMPLUGIN_H
 #define HYPEMPLUGIN_H

-#include "infoplugins/InfoPluginDllMacro.h"
+#include "../../InfoPluginDllMacro.h"
+
 #include "infosystem/InfoSystem.h"
 #include "infosystem/InfoSystemWorker.h"
 #include <QNetworkReply>
--- a/src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.h
+++ b/src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.h
@ -22,7 +22,8 @@

 #include "infosystem/InfoSystem.h"
 #include "infosystem/InfoSystemWorker.h"
-#include "infoplugins/InfoPluginDllMacro.h"
+
+#include "../../InfoPluginDllMacro.h"

 class QNetworkReply;

--- a/src/infoplugins/generic/musixmatch/MusixMatchPlugin.h
+++ b/src/infoplugins/generic/musixmatch/MusixMatchPlugin.h
@ -22,7 +22,9 @@

 #include "infosystem/InfoSystem.h"
 #include "infosystem/InfoSystemWorker.h"
-#include "infoplugins/InfoPluginDllMacro.h"
+
+#include "../../InfoPluginDllMacro.h"
+

 class QNetworkReply;

--- a/src/infoplugins/generic/newreleases/NewReleasesPlugin.h
+++ b/src/infoplugins/generic/newreleases/NewReleasesPlugin.h
@ -22,7 +22,9 @@

 #include "infosystem/InfoSystem.h"
 #include "infosystem/InfoSystemWorker.h"
-#include "infoplugins/InfoPluginDllMacro.h"
+
+#include "../../InfoPluginDllMacro.h"
+
 #include <QVariantMap>
 #include <QtNetwork/QNetworkReply>
 #include <QtCore/QObject>
--- a/src/infoplugins/generic/rovi/RoviPlugin.h
+++ b/src/infoplugins/generic/rovi/RoviPlugin.h
@ -21,7 +21,9 @@
 #define ROVIPLUGIN_H

 #include "infosystem/InfoSystem.h"
-#include "infoplugins/InfoPluginDllMacro.h"
+
+#include "../../InfoPluginDllMacro.h"
+

 #include <QNetworkReply>

--- a/src/infoplugins/generic/spotify/SpotifyPlugin.h
+++ b/src/infoplugins/generic/spotify/SpotifyPlugin.h
@ -22,7 +22,9 @@

 #include "infosystem/InfoSystem.h"
 #include "infosystem/InfoSystemWorker.h"
-#include "infoplugins/InfoPluginDllMacro.h"
+
+#include "../../InfoPluginDllMacro.h"
+

 #include <QNetworkReply>
 #include <QObject>
--- a/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.h
+++ b/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.h
@ -20,7 +20,8 @@
 #ifndef FDONOTIFYPLUGIN_H
 #define FDONOTIFYPLUGIN_H

-#include "infoplugins/InfoPluginDllMacro.h"
+#include "../../InfoPluginDllMacro.h"
+
 #include "infosystem/InfoSystem.h"

 #include <QDBusMessage>
--- a/src/infoplugins/linux/mpris/MprisPlugin.h
+++ b/src/infoplugins/linux/mpris/MprisPlugin.h
@ -24,7 +24,9 @@
 #include "Source.h"
 #include "audio/AudioEngine.h"
 #include "infosystem/InfoSystem.h"
-#include "infoplugins/InfoPluginDllMacro.h"
+
+#include "../../InfoPluginDllMacro.h"
+

 #include <QObject>
 #include <QVariant>
--- a/src/infoplugins/mac/adium/AdiumPlugin.h
+++ b/src/infoplugins/mac/adium/AdiumPlugin.h
@ -20,7 +20,8 @@
 #ifndef ADIUMPLUGIN_H
 #define ADIUMPLUGIN_H

-#include "infoplugins/InfoPluginDllMacro.h"
+#include "../../InfoPluginDllMacro.h"
+
 #include "infosystem/InfoSystem.h"

 #include <QNetworkAccessManager>
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@ -1,16 +1,14 @@
 project( tomahawklib )

-setup_qt()
-
 add_definitions( ${QT_DEFINITIONS} )
 add_definitions( -DQT_SHARED )
 add_definitions( -DDLLEXPORT_PRO )
 add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
 add_definitions( -DPORTFWDDLLEXPORT_STATIC )

-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../Config.h.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../tomahawk/Config.h.in
               ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../TomahawkVersion.h.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../tomahawk/TomahawkVersion.h.in
               ${CMAKE_CURRENT_BINARY_DIR}/TomahawkVersion.h)

 set( libGuiSources
--- a/src/tomahawk/CMakeLists.txt
+++ b/src/tomahawk/CMakeLists.txt
@ -1,9 +1,6 @@
 PROJECT( tomahawk )
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )

-
-setup_qt()
-
 include( AddAppIconMacro )

 # SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
@ -93,10 +90,10 @@ SET( tomahawkUI ${tomahawkUI}
 INCLUDE_DIRECTORIES(
    .
    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk
+    ${CMAKE_CURRENT_BINARY_DIR}/../libtomahawk

    sourcetree
-    libtomahawk
+    ../libtomahawk
    mac

    ${THIRDPARTY_DIR}/breakpad
@ -132,9 +129,6 @@ IF( APPLE )
    SET( tomahawkSources ${tomahawkSources} mac/TomahawkApp_Mac.mm mac/MacShortcutHandler.cpp )
 ENDIF( APPLE )

-ADD_SUBDIRECTORY( accounts )
-ADD_SUBDIRECTORY( infoplugins )
-
 IF(QCA2_FOUND)
    INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
 ENDIF(QCA2_FOUND)
@ -156,14 +150,10 @@ SET( final_src ${final_src} ${tomahawkMoc} ${tomahawkSources} ${trans_outfile})
 IF( BUILD_GUI )
    LIST(APPEND tomahawkSources ${tomahawkSourcesGui})
    qt_wrap_ui( tomahawkUI_H ${tomahawkUI} )
-
-    IF( WITH_CRASHREPORTER )
-        ADD_SUBDIRECTORY( breakpad/CrashReporter )
-    ENDIF()
 ENDIF()

 kde4_add_app_icon( tomahawkSources "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
-qt_add_resources( RC_SRCS "../resources.qrc" )
+qt_add_resources( RC_SRCS "../../resources.qrc" )

 SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} )

--- a/src/tomahawk/TomahawkApp.cpp
+++ b/src/tomahawk/TomahawkApp.cpp
@ -46,7 +46,7 @@
 #include "web/Api_v1.h"
 #include "SourceList.h"
 #include "ShortcutHandler.h"
-#include "libtomahawk/filemetadata/ScanManager.h"
+#include "filemetadata/ScanManager.h"
 #include "TomahawkSettings.h"
 #include "GlobalActionManager.h"
 #include "database/LocalCollection.h"