You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
25 lines
1.1 KiB
25 lines
1.1 KiB
From 9e0e5a52186d94331aa232c81d2db13e28d8a753 Mon Sep 17 00:00:00 2001 |
|
From: Justin Zobel <justin@1707.io> |
|
Date: Sun, 10 Apr 2022 19:27:47 +0930 |
|
Subject: [PATCH] extra-cmake-modules-5.89.0-qt_prefix |
|
|
|
--- |
|
kde-modules/KDEInstallDirs5.cmake | 2 +- |
|
1 file changed, 1 insertion(+), 1 deletion(-) |
|
|
|
diff --git a/kde-modules/KDEInstallDirs5.cmake b/kde-modules/KDEInstallDirs5.cmake |
|
index 0341196..55282a7 100644 |
|
--- a/kde-modules/KDEInstallDirs5.cmake |
|
+++ b/kde-modules/KDEInstallDirs5.cmake |
|
@@ -236,7 +236,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQt.cmake") |
|
set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF) |
|
if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS) |
|
ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX TRY) |
|
- if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") |
|
+ if( (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") OR ( ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") AND (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_FULL_LIBDIR}/qt5")) ) |
|
message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.") |
|
set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON) |
|
endif() |
|
-- |
|
2.35.1 |
|
|
|
|