X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=cmake%2FQuasselInstallDirs.cmake;h=cf39bfd0e15f40cf8741ba97d846709e7bb4434a;hp=9075a808d83303ac230e2008cdaabc26e8f1d2ac;hb=21b3d4d17220feb9d3b2f3d856d17f8606da5879;hpb=1cb02004ee5973b89368bd84f234d4652794690d

diff --git a/cmake/QuasselInstallDirs.cmake b/cmake/QuasselInstallDirs.cmake
index 9075a808..cf39bfd0 100644
--- a/cmake/QuasselInstallDirs.cmake
+++ b/cmake/QuasselInstallDirs.cmake
@@ -18,7 +18,10 @@ if (NOT WITH_KDE)
         # On Windows, we have to guess good paths
         # We must check if the variables are already defined on the command line
         if (NOT DEFINED CMAKE_INSTALL_BINDIR)
-            set(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Install path for binaries")
+            set(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Install path for executables and DLLs")
+        endif()
+        if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
+            set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Install path for static 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")
@@ -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()