38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 77ef8904f307f78613f799ad4b9946e23c7910e3 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 8 Nov 2020 00:34:09 +0100
|
|
Subject: [PATCH 7/7] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
|
|
static libraries
|
|
|
|
Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c
|
|
---
|
|
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
|
index 477f5d21e9..fa394cd895 100644
|
|
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
|
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
|
|
@@ -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)
|
|
|
|
+if (CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE)
|
|
+ set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}")
|
|
+endif ()
|
|
+
|
|
######################################
|
|
#
|
|
# Macros for building Qt modules
|
|
@@ -268,6 +272,7 @@ macro(qt_prepare_standalone_project)
|
|
endmacro()
|
|
|
|
macro(qt_build_repo_begin)
|
|
+
|
|
qt_build_internals_set_up_private_api()
|
|
qt_enable_cmake_languages()
|
|
|
|
--
|
|
2.30.0
|
|
|