forked from pool/libqt5-qtbase
3633f83323
Qt 5.13.1, disable KU* and KF* publishing before accepting OBS-URL: https://build.opensuse.org/request/show/729107 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qtbase?expand=0&rev=20
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From dc5362ac7d766a9c1b4ae328bc6ce8a1aa332773 Mon Sep 17 00:00:00 2001
|
|
From: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
Date: Fri, 6 Sep 2019 10:54:44 +0200
|
|
Subject: [PATCH] Fix CMake config files for -libdir different from "lib"
|
|
|
|
When Qt was configured with -libdir different from "lib", one could not
|
|
build with CMake whenever a static lib was pulled in (e.g. uitools).
|
|
|
|
Do not hard-code "/lib" but use the correct variable also for static
|
|
libraries.
|
|
|
|
Fixes: QTBUG-76255
|
|
Change-Id: I28c6861752e29e461247628d2b1f8a9ec32f0790
|
|
---
|
|
mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
|
index d4fd057682..f4a34d6e48 100644
|
|
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
|
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
|
@@ -53,7 +53,11 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
|
|
set(_lib_deps)
|
|
set(_link_flags)
|
|
|
|
- get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE)
|
|
+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
|
+ set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
|
|
+!!ELSE
|
|
+ set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
|
|
+!!ENDIF
|
|
|
|
if(EXISTS \"${prl_file_location}\")
|
|
file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\")
|
|
--
|
|
2.22.0
|
|
|