Justin Zobel 84dd4bf
From 9e0e5a52186d94331aa232c81d2db13e28d8a753 Mon Sep 17 00:00:00 2001
Justin Zobel 84dd4bf
From: Justin Zobel <justin@1707.io>
Justin Zobel 84dd4bf
Date: Sun, 10 Apr 2022 19:27:47 +0930
Justin Zobel 84dd4bf
Subject: [PATCH] extra-cmake-modules-5.89.0-qt_prefix
Justin Zobel 84dd4bf
Justin Zobel 84dd4bf
---
Justin Zobel 84dd4bf
 kde-modules/KDEInstallDirs5.cmake | 2 +-
Justin Zobel 84dd4bf
 1 file changed, 1 insertion(+), 1 deletion(-)
Justin Zobel 84dd4bf
Justin Zobel 84dd4bf
diff --git a/kde-modules/KDEInstallDirs5.cmake b/kde-modules/KDEInstallDirs5.cmake
Justin Zobel 84dd4bf
index 0341196..55282a7 100644
Justin Zobel 84dd4bf
--- a/kde-modules/KDEInstallDirs5.cmake
Justin Zobel 84dd4bf
+++ b/kde-modules/KDEInstallDirs5.cmake
Justin Zobel 84dd4bf
@@ -236,7 +236,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
79774cb
 set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF)
79774cb
 if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
Justin Zobel 84dd4bf
     ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
79774cb
-    if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
5df7823
+    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")) )
79774cb
         message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.")
79774cb
         set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON)
79774cb
     endif()
Justin Zobel 84dd4bf
-- 
Justin Zobel 84dd4bf
2.35.1
Justin Zobel 84dd4bf