X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=cmake%2FQuasselInstallDirs.cmake;h=9e9dac413a3c5ae4f395ab7fc1a6b5e2d3ba7286;hp=9075a808d83303ac230e2008cdaabc26e8f1d2ac;hb=0fcf6adf1ca3a256bd0e5c1db40507874b9d65a8;hpb=c52a94cb937654bf06d5074bf0736a52ec94a52d

diff --git a/cmake/QuasselInstallDirs.cmake b/cmake/QuasselInstallDirs.cmake
index 9075a808..9e9dac41 100644
--- a/cmake/QuasselInstallDirs.cmake
+++ b/cmake/QuasselInstallDirs.cmake
@@ -20,6 +20,9 @@ if (NOT WITH_KDE)
         if (NOT DEFINED CMAKE_INSTALL_BINDIR)
             set(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Install path for binaries")
         endif()
+        if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
+            set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Install path for libraries")
+        endif()
         if (NOT DEFINED CMAKE_INSTALL_DATADIR)
             set(CMAKE_INSTALL_DATADIR "$ENV{APPDATA}/quassel-irc.org/share/apps" CACHE PATH "Install path for data files")
         endif()
@@ -43,23 +46,4 @@ if (NOT WITH_KDE)
             set(CMAKE_INSTALL_APPDIR "${CMAKE_INSTALL_DATAROOTDIR}/applications")
         endif()
     endif()
-else()
-    if (WITH_KDE4)
-        # FindKDE4Internal.cmake sets its own set of variables, however with deprecated names
-        if (NOT DEFINED CMAKE_INSTALL_BINDIR)
-            set(CMAKE_INSTALL_BINDIR "${BIN_INSTALL_DIR}" CACHE PATH "Install path for binaries")
-        endif()
-        if (NOT DEFINED CMAKE_INSTALL_DATADIR)
-            set(CMAKE_INSTALL_DATADIR "${DATA_INSTALL_DIR}" CACHE PATH "Install path for data files")
-        endif()
-        if (NOT DEFINED CMAKE_INSTALL_ICONDIR)
-            set(CMAKE_INSTALL_ICONDIR "${ICON_INSTALL_DIR}" CACHE PATH "Install path for icons")
-        endif()
-        if (NOT DEFINED CMAKE_INSTALL_APPDIR)
-            set(CMAKE_INSTALL_APPDIR "${XDG_APPS_INSTALL_DIR}" CACHE PATH "Install path for .desktop files")
-        endif()
-    endif()
-
-    # KF5 does the correct thing, so we don't need to do anything
-    # We have already included KDEInstallDirs at this point.
 endif()