cmake: Set proper install paths for Windows
authorManuel Nickschas <sputnick@quassel-irc.org>
Sun, 18 Nov 2018 17:31:07 +0000 (18:31 +0100)
committerManuel Nickschas <sputnick@quassel-irc.org>
Sun, 18 Nov 2018 23:59:46 +0000 (00:59 +0100)
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.

cmake/QuasselInstallDirs.cmake

index 9e9dac4..cf39bfd 100644 (file)
@@ -18,10 +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}" CACHE PATH "Install path for libraries")
+            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")