status-im
/
snorenotify
mirror of https://github.com/status-im/snorenotify.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes

This commit is contained in:
Patrick von Reth 2014-01-23 15:04:52 +01:00
parent 46ac673070
commit caeb0493d7
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/plugins/plugincontainer.cpp
View File

@ -204,15 +204,19 @@ const QDir PluginContainer::pluginDir()
list << QString("%1/../lib/libsnore").arg(appDir) list << QString("%1/../lib/libsnore").arg(appDir)
<< QString("%1/../lib64/libsnore").arg(appDir) << QString("%1/../lib64/libsnore").arg(appDir)
<< QString("%1/libsnore").arg(appDir) << QString("%1/libsnore").arg(appDir)
<< QString("%1/").arg(appDir)
<< QLatin1String(LIBSNORE_PLUGIN_PATH); << QLatin1String(LIBSNORE_PLUGIN_PATH);
foreach(const QString &p, list) foreach(const QString &p, list)
{ {
if(QDir(p).exists()) QDir dir(p);
if(dir.exists())
{ {
path = p; path = dir.absolutePath();
break; break;
} }
else
{
snoreDebug( SNORE_DEBUG ) << "Possible pluginpath:" << dir.absolutePath() << "does not exist";
}
} }
snoreDebug( SNORE_INFO ) << "PluginPath is :" << path; snoreDebug( SNORE_INFO ) << "PluginPath is :" << path;
} }

1
src/plugins/CMakeLists.txt
View File

@ -1,4 +1,5 @@
set(CMAKE_SHARED_MODULE_PREFIX) set(CMAKE_SHARED_MODULE_PREFIX)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/libsnore)
add_subdirectory(backends) add_subdirectory(backends)
add_subdirectory(frontends) add_subdirectory(frontends)

4
src/plugins/backends/freedesktop/CMakeLists.txt
View File

@ -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 ) qt4_add_dbus_interface( FREEDESKTOP_NOTIFICATION_SRC ../../frontends/freedesktop/org.freedesktop.Notifications.xml notificationinterface )
add_library(freedesktop_backend MODULE ${FREEDESKTOP_NOTIFICATION_SRC} ) add_library(libsnore_backend_freedesktop MODULE ${FREEDESKTOP_NOTIFICATION_SRC} )
target_link_libraries(freedesktop_backend snorecore ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ) target_link_libraries(libsnore_backend_freedesktop snorecore ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} )
install(TARGETS libsnore_backend_freedesktop ${SNORE_PLUGIN_INSTALL_PATH}) install(TARGETS libsnore_backend_freedesktop ${SNORE_PLUGIN_INSTALL_PATH})
endif(QT_QTDBUS_FOUND AND NOT WITH_FREEDESKTOP_FRONTEND AND UNIX AND NOT APPLE) endif(QT_QTDBUS_FOUND AND NOT WITH_FREEDESKTOP_FRONTEND AND UNIX AND NOT APPLE)