summarylogtreecommitdiffstats
path: root/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
diff options
context:
space:
mode:
authorMartchus2024-02-15 21:21:56 +0100
committerMartchus2024-02-15 21:21:56 +0100
commit73d39ea54cd7d1558c20c40807c271b40f105732 (patch)
tree8c1b947999b30660dbf8ff1cbbd0abe623ced342 /0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
parentba1d2ef6290a01b0e7bce06e6b4297d09b5c0acc (diff)
downloadaur-73d39ea54cd7d1558c20c40807c271b40f105732.tar.gz
Update to 6.6.2
Diffstat (limited to '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch')
-rw-r--r--0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
index d55dafd283fd..b9522d74991f 100644
--- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@@ -1,16 +1,16 @@
-From c4643677a73f0277e472a867039fd0b09656d71a Mon Sep 17 00:00:00 2001
+From dc4b23c50ba75b9bffc397c38f73496d7bf04100 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:34:09 +0100
Subject: [PATCH 07/13] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
static libraries
-Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
+Change-Id: Ibb688ac503ecdf1dd3bd838890efdfc01bf706aa
---
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-index e8e981542c..bd3dca6970 100644
+index 129f1ebb77..9bae62d879 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -4,6 +4,10 @@
@@ -21,9 +21,9 @@ index e8e981542c..bd3dca6970 100644
+ set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}")
+endif ()
+
- ###############################################
- #
- # Macros and functions for building Qt modules
+ set(QT_BACKUP_CMAKE_INSTALL_PREFIX_BEFORE_EXTRA_INCLUDE "${CMAKE_INSTALL_PREFIX}")
+
+ # This depends on qt_internal_read_repo_dependencies existing.
--
2.43.0