2021-06-08 13:12:14 +02:00
|
|
|
From 8507a185bd7614aa5250495904348ac25ad1b8ac 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
|
2021-06-08 13:12:14 +02:00
|
|
|
Subject: [PATCH 7/7] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
|
2020-11-07 00:36:08 +01:00
|
|
|
static libraries
|
|
|
|
|
2021-06-08 13:12:14 +02:00
|
|
|
Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
|
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
|
2021-06-08 13:12:14 +02:00
|
|
|
index af8c3d18c4..eb1f47c6e1 100644
|
2020-11-07 00:36:08 +01:00
|
|
|
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
|
|
|
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
2021-02-04 18:12:25 +01:00
|
|
|
@@ -1,6 +1,10 @@
|
|
|
|
# These values should be kept in sync with those in qtbase/.cmake.conf
|
|
|
|
cmake_minimum_required(VERSION 3.14...3.19)
|
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 ()
|
|
|
|
+
|
2021-06-08 13:12:14 +02:00
|
|
|
###############################################
|
2020-11-07 00:36:08 +01:00
|
|
|
#
|
2021-06-08 13:12:14 +02:00
|
|
|
# Macros and functions for building Qt modules
|
2020-11-07 00:36:08 +01:00
|
|
|
--
|
2021-06-08 13:12:14 +02:00
|
|
|
2.32.0
|
2020-11-07 00:36:08 +01:00
|
|
|
|