From e8af9d4c1f1a966f1f0a12df8a7d40d5ff4228a9 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Tue, 15 Jan 2013 14:59:57 +0100
Subject: [PATCH] Rename add_tomahawk_plugin macro to tomahawk_add_plugin

---
 .../{AddTomahawkPlugin.cmake => TomahawkAddPlugin.cmake}      | 4 ++--
 src/accounts/CMakeLists.txt                                   | 2 +-
 src/accounts/twitter/CMakeLists.txt                           | 2 +-
 src/accounts/xmpp/CMakeLists.txt                              | 2 +-
 src/accounts/xmpp/googlewrapper/CMakeLists.txt                | 2 +-
 src/accounts/zeroconf/CMakeLists.txt                          | 2 +-
 src/infoplugins/generic/CMakeLists.txt                        | 2 +-
 src/infoplugins/linux/CMakeLists.txt                          | 4 ++--
 src/infoplugins/mac/CMakeLists.txt                            | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename CMakeModules/{AddTomahawkPlugin.cmake => TomahawkAddPlugin.cmake} (97%)

diff --git a/CMakeModules/AddTomahawkPlugin.cmake b/CMakeModules/TomahawkAddPlugin.cmake
similarity index 97%
rename from CMakeModules/AddTomahawkPlugin.cmake
rename to CMakeModules/TomahawkAddPlugin.cmake
index 5afcada9a..33c0018ca 100644
--- a/CMakeModules/AddTomahawkPlugin.cmake
+++ b/CMakeModules/TomahawkAddPlugin.cmake
@@ -38,7 +38,7 @@ MACRO(CDR var junk)
 ENDMACRO(CDR)
 
 
-macro(add_tomahawk_plugin)
+macro(tomahawk_add_plugin)
     parse_arguments(PLUGIN
         "SOURCES;UI;LINK_LIBRARIES;TYPE;EXPORT_MACRO;COMPILE_DEFINITIONS"
         "NO_INSTALL;SHARED_LIB"
@@ -93,7 +93,7 @@ macro(add_tomahawk_plugin)
     endif()
 
     # add link targets
-    target_link_libraries(${target} tomahawklib)
+    target_link_libraries(${target} ${TOMAHAWK_LIBRARIES})
     if(PLUGIN_LINK_LIBRARIES)
         target_link_libraries(${target} ${PLUGIN_LINK_LIBRARIES})
     endif()
diff --git a/src/accounts/CMakeLists.txt b/src/accounts/CMakeLists.txt
index 76552a5c2..be884d969 100644
--- a/src/accounts/CMakeLists.txt
+++ b/src/accounts/CMakeLists.txt
@@ -1,4 +1,4 @@
-include(AddTomahawkPlugin)
+include(TomahawkAddPlugin)
 
 IF( JREEN_FOUND )
     add_subdirectory( xmpp )
diff --git a/src/accounts/twitter/CMakeLists.txt b/src/accounts/twitter/CMakeLists.txt
index 558054b0a..a6d83984f 100644
--- a/src/accounts/twitter/CMakeLists.txt
+++ b/src/accounts/twitter/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 include_directories(${QTWEETLIB_INCLUDE_DIR})
 
-add_tomahawk_plugin(twitter
+tomahawk_add_plugin(twitter
     TYPE account
     EXPORT_MACRO ACCOUNTDLLEXPORT_PRO
     SOURCES
diff --git a/src/accounts/xmpp/CMakeLists.txt b/src/accounts/xmpp/CMakeLists.txt
index af2e67b16..eaadcc329 100644
--- a/src/accounts/xmpp/CMakeLists.txt
+++ b/src/accounts/xmpp/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(${JREEN_INCLUDE_DIR})
 
-add_tomahawk_plugin(xmpp
+tomahawk_add_plugin(xmpp
     TYPE account
     EXPORT_MACRO ACCOUNTDLLEXPORT_PRO
     SOURCES
diff --git a/src/accounts/xmpp/googlewrapper/CMakeLists.txt b/src/accounts/xmpp/googlewrapper/CMakeLists.txt
index 973b70514..45318c526 100644
--- a/src/accounts/xmpp/googlewrapper/CMakeLists.txt
+++ b/src/accounts/xmpp/googlewrapper/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories( ${JREEN_INCLUDE_DIR} )
 
-add_tomahawk_plugin(google
+tomahawk_add_plugin(google
     TYPE account
     EXPORT_MACRO ACCOUNTDLLEXPORT_PRO
     SOURCES
diff --git a/src/accounts/zeroconf/CMakeLists.txt b/src/accounts/zeroconf/CMakeLists.txt
index a41333c55..34dcc5583 100644
--- a/src/accounts/zeroconf/CMakeLists.txt
+++ b/src/accounts/zeroconf/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_tomahawk_plugin(zeroconf
+tomahawk_add_plugin(zeroconf
     TYPE account
     EXPORT_MACRO ACCOUNTDLLEXPORT_PRO
     SOURCES
diff --git a/src/infoplugins/generic/CMakeLists.txt b/src/infoplugins/generic/CMakeLists.txt
index 60e981687..442bdf886 100644
--- a/src/infoplugins/generic/CMakeLists.txt
+++ b/src/infoplugins/generic/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND simple_plugins
 
 foreach(simple_plugin ${simple_plugins})
     STRING(TOLOWER "${simple_plugin}" dir)
-    add_tomahawk_plugin(${dir}
+    tomahawk_add_plugin(${dir}
         TYPE infoplugin EXPORT_MACRO INFOPLUGINDLLEXPORT_PRO
         SOURCES "${dir}/${simple_plugin}Plugin.cpp"
     )
diff --git a/src/infoplugins/linux/CMakeLists.txt b/src/infoplugins/linux/CMakeLists.txt
index c8d559160..6c23ef980 100644
--- a/src/infoplugins/linux/CMakeLists.txt
+++ b/src/infoplugins/linux/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT Qt5Core_DIR)
         )
         SET(FDO_LINK_LIBRARIES ${LINK_LIBRARIES} ${X11_LIBRARIES})
 
-        add_tomahawk_plugin(fdonotify
+        tomahawk_add_plugin(fdonotify
             TYPE infoplugin EXPORT_MACRO INFOPLUGINDLLEXPORT_PRO
             SOURCES "${fdo_srcs}" LINK_LIBRARIES "${FDO_LINK_LIBRARIES}"
         )
@@ -24,7 +24,7 @@ SET(mpris_srcs
     mpris/MprisPlugin.cpp
     )
 
-add_tomahawk_plugin(mpris
+tomahawk_add_plugin(mpris
     TYPE infoplugin EXPORT_MACRO INFOPLUGINDLLEXPORT_PRO
     SOURCES "${mpris_srcs}"
     )
diff --git a/src/infoplugins/mac/CMakeLists.txt b/src/infoplugins/mac/CMakeLists.txt
index 8f75a22a9..764afb700 100644
--- a/src/infoplugins/mac/CMakeLists.txt
+++ b/src/infoplugins/mac/CMakeLists.txt
@@ -4,7 +4,7 @@ set(adium_srcs
 )
 
 
-add_tomahawk_plugin(adium
+tomahawk_add_plugin(adium
     TYPE infoplugin EXPORT_MACRO INFOPLUGINDLLEXPORT_PRO
     SOURCES "${adium_srcs}"
 )