changed plugin install path

CMakeLists.txt

@@ -7,6 +7,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 
 #######################################################################
+option(WITH_WITH_KDE "Try to build with KDE support if availibe" ON)
 option(WITH_FREEDESKTOP_FRONTEND "Build the freedesktop frontend" OFF)
 option(WITH_GROWL_BACKEND "Build the Growl backend" ON)
 option(WITH_SNORE_DEAMON "Build the Snore deamon, which redirects notifications" OFF)
@@ -16,21 +17,17 @@ set(SNORE_VERSION_MAJOR 0)
 set(SNORE_VERSION_MINOR 5)
 set(SNORE_VERSION_SUFFIX "pre")
 
+if(WITH_WITH_KDE)
+    find_package(KDE4)
+endif()
 
 
-find_package(KDE4)
-
-if(MINGW)
-SET (CMAKE_RC_COMPILER_INIT windres)
-ENABLE_LANGUAGE (RC)
-SET (CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -i <SOURCE> -o <OBJECT>")
-endif(MINGW)
 
 if(KDE4_FOUND)
-	add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS} -D_UNICODE)
-	include_directories(${KDE4_INCLUDES})
+    add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS} -D_UNICODE)
+    include_directories(${KDE4_INCLUDES})
 else(KDE4_FOUND)
-	include(NoKDE)
+    include(NoKDE)
 endif(KDE4_FOUND)
 
 
@@ -41,8 +38,8 @@ if(Boost_USE_STATIC_RUNTIME)
     add_definitions(-DBOOST_THREAD_USE_LIB )
 endif(Boost_USE_STATIC_RUNTIME)
 
-set(PLUGIN_INSTALL_PATH  LIBRARY DESTINATION bin/snoreplugins)
-add_definitions(-DLIBSNORE_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/bin/snoreplugins")
+set(SNORE_PLUGIN_INSTALL_PATH LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/libsnore)
+add_definitions(-DLIBSNORE_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libsnore" -DCMAKE_INSTALL_LIBDIR="${CMAKE_INSTALL_LIBDIR}")
 
 add_subdirectory(data)
 add_subdirectory(share)

cmake/modules/NoKDE.cmake

@@ -1,6 +1,7 @@
 find_package(Qt5Transitional)
 include_directories( ${QT_INCLUDES} )
 
+include(GNUInstallDirs)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
@@ -21,9 +22,15 @@ if (CMAKE_COMPILER_IS_GNUCXX)
      set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -fno-check-new -fno-common -fPIC")
      add_definitions (-D_BSD_SOURCE)
    endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-   
-	if(WIN32)
-		add_definitions(-DQT_NO_DEBUG -DQT_FORCE_ASSERTS)
-	endif(WIN32)
 
 endif(CMAKE_COMPILER_IS_GNUCXX) 
+
+if(MINGW)
+    set(CMAKE_RC_COMPILER_INIT windres)
+    enable_language(RC)
+    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -i <SOURCE> -o <OBJECT>")
+endif()
+
+if(WIN32)
+    add_definitions(-DQT_NO_DEBUG -DQT_FORCE_ASSERTS)
+endif()

src/core/snore_p.cpp

@@ -36,7 +36,7 @@ QString const SnoreCorePrivate::snoreTMP(){
 }
 
 const QDir &SnoreCorePrivate::pluginDir(){
-    static QDir path(QString("%1/snoreplugins").arg(qApp->applicationDirPath()));
+    static QDir path(QString("%1/../%2/libsnore").arg(qApp->applicationDirPath(), CMAKE_INSTALL_LIBDIR));
     if(!path.exists())
     {
         path = QDir(LIBSNORE_PLUGIN_PATH);

src/plugins/backends/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(SNORE_BACKEND_INSTALL_PATH ${PLUGIN_INSTALL_PATH}/backend)
+set(SNORE_BACKEND_INSTALL_PATH ${SNORE_PLUGIN_INSTALL_PATH}/backend)
 
 add_subdirectory(freedesktop)
 add_subdirectory(snarl)

src/plugins/frontends/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(SNORE_FRONTEND_INSTALL_PATH ${PLUGIN_INSTALL_PATH}/frontend)
+set(SNORE_FRONTEND_INSTALL_PATH ${SNORE_PLUGIN_INSTALL_PATH}/frontend)
 
 
 add_subdirectory(freedesktop)

src/plugins/plugins/CMakeLists.txt

@@ -1,3 +1,3 @@
-set(SNORE_PLUGINS_INSTALL_PATH ${PLUGIN_INSTALL_PATH}/plugin)
+set(SNORE_PLUGINS_INSTALL_PATH ${SNORE_PLUGIN_INSTALL_PATH}/plugin)
 
 

src/plugins/secondary_backends/CMakeLists.txt

@@ -1,2 +1,2 @@
-set(SNORE_SECONDARY_BACKEND_INSTALL_PATH ${PLUGIN_INSTALL_PATH}/secondary_backend)
+set(SNORE_SECONDARY_BACKEND_INSTALL_PATH ${SNORE_PLUGIN_INSTALL_PATH}/secondary_backend)