* CMakeLists.* cleanup.

src/CMakeLists.txt

@@ -7,8 +7,8 @@ ENDIF()
 SET( QT_USE_QTSQL TRUE )
 SET( QT_USE_QTNETWORK TRUE )
 SET( QT_USE_QTXML TRUE )
-INCLUDE( ${QT_USE_FILE} )
 
+INCLUDE( ${QT_USE_FILE} )
 INCLUDE( ${CMAKE_MODULE_PATH}/AddAppIconMacro.cmake )
 
 #SET( CMAKE_BUILD_TYPE "Release" )
@@ -40,20 +40,18 @@ SET( tomahawkSources ${tomahawkSources}
      infosystem/infoplugins/echonestplugin.cpp
      infosystem/infoplugins/musixmatchplugin.cpp
 
-     musicscanner.cpp
-     scriptresolver.cpp
-
-     scrobbler.cpp
      xmppbot/xmppbot.cpp
      web/api_v1.cpp
 
+     musicscanner.cpp
+     scriptresolver.cpp
+     scrobbler.cpp
+
      tomahawkapp.cpp
      main.cpp
 )
 
 SET( tomahawkSourcesGui ${tomahawkSourcesGui}
-     xspfloader.cpp
-
      utils/querylabel.cpp
      utils/elidedlabel.cpp
      utils/imagebutton.cpp
@@ -100,16 +98,16 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
      widgets/newplaylistwidget.cpp
      widgets/welcomewidget.cpp
 
+     xspfloader.cpp
      transferview.cpp
-     tomahawkwindow.cpp
      tomahawktrayicon.cpp
      audiocontrols.cpp
      settingsdialog.cpp
+     tomahawkwindow.cpp
 )
 
 SET( tomahawkHeaders ${tomahawkHeaders}
      "${TOMAHAWK_INC_DIR}/tomahawk/tomahawkapp.h"
-
      "${TOMAHAWK_INC_DIR}/tomahawk/infosystem.h"
 
      audio/transcodeinterface.h
@@ -123,17 +121,15 @@ SET( tomahawkHeaders ${tomahawkHeaders}
      infosystem/infoplugins/echonestplugin.h
      infosystem/infoplugins/musixmatchplugin.h
 
-     musicscanner.h
-     scriptresolver.h
-
-     scrobbler.h
      xmppbot/xmppbot.h
      web/api_v1.h
+
+     musicscanner.h
+     scriptresolver.h
+     scrobbler.h
 )
 
 SET( tomahawkHeadersGui ${tomahawkHeadersGui}
-     xspfloader.h
-
      utils/querylabel.h
      utils/elidedlabel.h
      utils/animatedcounterlabel.h
@@ -181,11 +177,12 @@ SET( tomahawkHeadersGui ${tomahawkHeadersGui}
      widgets/newplaylistwidget.h
      widgets/welcomewidget.h
 
+     xspfloader.h
      transferview.h
-     tomahawkwindow.h
      tomahawktrayicon.h
      audiocontrols.h
      settingsdialog.h
+     tomahawkwindow.h
 )
 
 SET( tomahawkUI ${tomahawkUI}
@@ -196,6 +193,7 @@ SET( tomahawkUI ${tomahawkUI}
      audiocontrols.ui
      sourcetree/sourcetreeitemwidget.ui
      topbar/topbar.ui
+
      infowidgets/sourceinfowidget.ui
      widgets/newplaylistwidget.ui
      widgets/welcomewidget.ui

src/CMakeLists.unix.txt

@@ -23,6 +23,7 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
 IF( APPLE )
     INCLUDE( "CMakeLists.osx.txt" )
 ENDIF( APPLE )
+
 IF( UNIX AND NOT APPLE )
     INCLUDE( "CMakeLists.linux.txt" )
 ENDIF( UNIX AND NOT APPLE )

src/libtomahawk/CMakeLists.txt

@@ -3,7 +3,9 @@ project( tomahawklib )
 SET( QT_USE_QTSQL TRUE )
 SET( QT_USE_QTNETWORK TRUE )
 SET( QT_USE_QTXML TRUE )
+
 include( ${QT_USE_FILE} )
+
 add_definitions( ${QT_DEFINITIONS} )
 add_definitions( -DQT_SHARED )
 add_definitions( -DDLLEXPORT_PRO )
@@ -12,7 +14,6 @@ set( libSources
     tomahawksettings.cpp
     sourcelist.cpp
     pipeline.cpp
-
     artist.cpp
     album.cpp
     collection.cpp
@@ -24,14 +25,8 @@ set( libSources
 
     sip/SipPlugin.cpp
 
-     network/bufferiodevice.cpp
+    database/database.cpp
-     network/msgprocessor.cpp
+    database/databasecollection.cpp
-     network/filetransferconnection.cpp
-     network/dbsyncconnection.cpp
-     network/remotecollection.cpp
-     network/portfwdthread.cpp
-
-     database/fuzzyindex.cpp
     database/databaseworker.cpp
     database/databaseimpl.cpp
     database/databaseresolver.cpp
@@ -57,10 +52,14 @@ set( libSources
     database/databasecommand_renameplaylist.cpp
     database/databasecommand_loadops.cpp
     database/databasecommand_updatesearchindex.cpp
-     database/databasecollection.cpp
+    database/fuzzyindex.cpp
-
-	database/database.cpp
 
+    network/bufferiodevice.cpp
+    network/msgprocessor.cpp
+    network/filetransferconnection.cpp
+    network/dbsyncconnection.cpp
+    network/remotecollection.cpp
+    network/portfwdthread.cpp
     network/servent.cpp
     network/connection.cpp
     network/controlconnection.cpp
@@ -71,14 +70,12 @@ set( libHeaders
     sourcelist.h
     pipeline.h
     functimeout.h
-
     collection.h
     pluginapi.h
     query.h
     resolver.h
     result.h
     source.h
-
     artist.h
     album.h
     track.h
@@ -87,7 +84,7 @@ set( libHeaders
     sip/SipPlugin.h
 
     database/database.h
-     database/fuzzyindex.h
+    database/databasecollection.h
     database/databaseworker.h
     database/databaseimpl.h
     database/databaseresolver.h
@@ -113,7 +110,7 @@ set( libHeaders
     database/databasecommand_renameplaylist.h
     database/databasecommand_loadops.h
     database/databasecommand_updatesearchindex.h
-     database/databasecollection.h
+    database/fuzzyindex.h
 
     network/bufferiodevice.h
     network/msgprocessor.h