From caeb0493d70365aa133401d17282e41371811633 Mon Sep 17 00:00:00 2001
From: Patrick von Reth <vonreth@kde.org>
Date: Thu, 23 Jan 2014 15:04:52 +0100
Subject: [PATCH] fixes

---
 src/core/plugins/plugincontainer.cpp            | 10 +++++++---
 src/plugins/CMakeLists.txt                      |  3 ++-
 src/plugins/backends/freedesktop/CMakeLists.txt |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/core/plugins/plugincontainer.cpp b/src/core/plugins/plugincontainer.cpp
index 8ba6fef..6e003bc 100644
--- a/src/core/plugins/plugincontainer.cpp
+++ b/src/core/plugins/plugincontainer.cpp
@@ -204,15 +204,19 @@ const QDir PluginContainer::pluginDir()
         list << QString("%1/../lib/libsnore").arg(appDir)
              << QString("%1/../lib64/libsnore").arg(appDir)
              << QString("%1/libsnore").arg(appDir)
-             << QString("%1/").arg(appDir)
              << QLatin1String(LIBSNORE_PLUGIN_PATH);
         foreach(const QString &p, list)
         {
-            if(QDir(p).exists())
+            QDir dir(p);
+            if(dir.exists())
             {
-                path = p;
+                path = dir.absolutePath();
                 break;
             }
+            else
+            {
+                snoreDebug( SNORE_DEBUG ) << "Possible pluginpath:" << dir.absolutePath() << "does not exist";
+            }
         }
         snoreDebug( SNORE_INFO ) << "PluginPath is :" << path;
     }
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index b539866..1b0049b 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(CMAKE_SHARED_MODULE_PREFIX)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/libsnore)
 
 add_subdirectory(backends)
 add_subdirectory(frontends)
 add_subdirectory(secondary_backends)
-add_subdirectory(plugins)
\ No newline at end of file
+add_subdirectory(plugins)
diff --git a/src/plugins/backends/freedesktop/CMakeLists.txt b/src/plugins/backends/freedesktop/CMakeLists.txt
index 1ce39fe..a9d81cc 100644
--- a/src/plugins/backends/freedesktop/CMakeLists.txt
+++ b/src/plugins/backends/freedesktop/CMakeLists.txt
@@ -9,8 +9,8 @@ if(QT_QTDBUS_FOUND AND NOT WITH_FREEDESKTOP_FRONTEND AND UNIX AND NOT APPLE)
       qt4_add_dbus_interface( FREEDESKTOP_NOTIFICATION_SRC ../../frontends/freedesktop/org.freedesktop.Notifications.xml notificationinterface )
 
 
-    add_library(freedesktop_backend MODULE  ${FREEDESKTOP_NOTIFICATION_SRC} )
-    target_link_libraries(freedesktop_backend  snorecore  ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} )
+    add_library(libsnore_backend_freedesktop MODULE  ${FREEDESKTOP_NOTIFICATION_SRC} )
+    target_link_libraries(libsnore_backend_freedesktop snorecore  ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} )
 
     install(TARGETS libsnore_backend_freedesktop ${SNORE_PLUGIN_INSTALL_PATH})
 endif(QT_QTDBUS_FOUND AND NOT WITH_FREEDESKTOP_FRONTEND AND UNIX AND NOT APPLE)