From 6bec067815d889c8c5d19dac2c5766989ba37beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Sch=C3=A4fer?= Date: Fri, 19 Jan 2018 13:46:14 +0100 Subject: [PATCH 1/2] remove manual KDE_INSTALL_LIBDIR this is inherited by KDEInstallDirs, which respects distro-specific settings --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d80027..e43d9fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,6 @@ set(CMAKE_CXX_STANDARD 14) set(QT_MIN_VERSION "5.4.1") set(KF5_MIN_VERSION "5.9.0") set(CMAKE_INSTALL_PREFIX /usr) -set(KDE_INSTALL_LIBDIR lib64/qt5) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets Quick QuickWidgets) # CMAKE EXTRA MODULES From 6057ee1f9ded9cf92da57d3897499e06b3d3b0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Sch=C3=A4fer?= Date: Fri, 19 Jan 2018 16:34:59 +0100 Subject: [PATCH 2/2] do not hardcode CMAKE_INSTALL_PREFIX use a default fallback instead see: https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e43d9fb..d61f57e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,9 @@ project(PlayBar) set(CMAKE_CXX_STANDARD 14) set(QT_MIN_VERSION "5.4.1") set(KF5_MIN_VERSION "5.9.0") -set(CMAKE_INSTALL_PREFIX /usr) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Standard install prefix" FORCE) +endif() find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets Quick QuickWidgets) # CMAKE EXTRA MODULES