cmake: Set proper install paths for Windows

Instead of dumping everything into the install prefix, set
separate paths for runtime and library artifacts.

The paths chosen match the expectations of Craft packaging, so
we can subsequently remove the overrides in the craft blueprint.

(cherry picked from commit 21b3d4d17220feb9d3b2f3d856d17f8606da5879)

diff --git a/cmake/QuasselInstallDirs.cmake b/cmake/QuasselInstallDirs.cmake
index 9075a80..7642676 100644 (file)
--- 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)
         # 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")
         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")