2024-05-21 17:02:41 +02:00
|
|
|
From ffd4524cadfa5fe5b84f3809123ee5a0511c6416 Mon Sep 17 00:00:00 2001
|
2020-11-07 00:36:08 +01:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
Date: Sun, 8 Nov 2020 00:34:09 +0100
|
2024-05-21 17:02:41 +02:00
|
|
|
Subject: [PATCH 07/16] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
|
2020-11-07 00:36:08 +01:00
|
|
|
static libraries
|
|
|
|
|
2024-02-15 16:48:07 +01:00
|
|
|
Change-Id: Ibb688ac503ecdf1dd3bd838890efdfc01bf706aa
|
2020-11-07 00:36:08 +01:00
|
|
|
---
|
2021-06-08 13:12:14 +02:00
|
|
|
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 ++++
|
|
|
|
1 file changed, 4 insertions(+)
|
2020-11-07 00:36:08 +01:00
|
|
|
|
|
|
|
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
2024-03-28 12:00:21 +01:00
|
|
|
index 129f1ebb771..9bae62d8795 100644
|
2020-11-07 00:36:08 +01:00
|
|
|
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
|
|
|
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
2023-03-31 23:09:26 +02:00
|
|
|
@@ -4,6 +4,10 @@
|
2021-02-04 18:12:25 +01:00
|
|
|
# These values should be kept in sync with those in qtbase/.cmake.conf
|
2023-03-31 23:09:26 +02:00
|
|
|
cmake_minimum_required(VERSION 3.16...3.21)
|
2020-11-07 00:36:08 +01:00
|
|
|
|
|
|
|
+if (CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE)
|
|
|
|
+ set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}")
|
|
|
|
+endif ()
|
|
|
|
+
|
2024-02-15 16:48:07 +01:00
|
|
|
set(QT_BACKUP_CMAKE_INSTALL_PREFIX_BEFORE_EXTRA_INCLUDE "${CMAKE_INSTALL_PREFIX}")
|
|
|
|
|
|
|
|
# This depends on qt_internal_read_repo_dependencies existing.
|
2020-11-07 00:36:08 +01:00
|
|
|
--
|
2024-05-21 17:02:41 +02:00
|
|
|
2.45.1
|
2020-11-07 00:36:08 +01:00
|
|
|
|