From 21b3d4d17220feb9d3b2f3d856d17f8606da5879 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sun, 18 Nov 2018 18:31:07 +0100 Subject: [PATCH 1/1] 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. --- cmake/QuasselInstallDirs.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QuasselInstallDirs.cmake b/cmake/QuasselInstallDirs.cmake index 9e9dac41..cf39bfd0 100644 --- a/cmake/QuasselInstallDirs.cmake +++ b/cmake/QuasselInstallDirs.cmake @@ -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") -- 2.20.1