summarylogtreecommitdiffstats
path: root/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
diff options
context:
space:
mode:
authorMartchus2021-05-08 14:31:16 +0200
committerMartchus2021-05-08 14:31:16 +0200
commitc1d86d30df80db0b2bdfc39f919ad794242fde64 (patch)
tree72903a842ad592f2cc7aa0d4086414f91d947a2d /0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
parentd44321efdabde9b77a3f745f7cf11974003bed70 (diff)
downloadaur-c1d86d30df80db0b2bdfc39f919ad794242fde64.tar.gz
Update to 6.1.0
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.patch10
1 files changed, 5 insertions, 5 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 70155e68f7cb..6327f1f2d232 100644
--- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@@ -1,7 +1,7 @@
-From 77ef8904f307f78613f799ad4b9946e23c7910e3 Mon Sep 17 00:00:00 2001
+From e682df25245fd2731bfe0572b2668e47f7ea3e99 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
+Subject: [PATCH 7/8] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
static libraries
Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c
@@ -10,7 +10,7 @@ Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c
1 file changed, 5 insertions(+)
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-index 477f5d21e9..fa394cd895 100644
+index 934c34b01c..bada2aff0c 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -1,6 +1,10 @@
@@ -24,7 +24,7 @@ index 477f5d21e9..fa394cd895 100644
######################################
#
# Macros for building Qt modules
-@@ -268,6 +272,7 @@ macro(qt_prepare_standalone_project)
+@@ -285,6 +289,7 @@ macro(qt_prepare_standalone_project)
endmacro()
macro(qt_build_repo_begin)
@@ -33,5 +33,5 @@ index 477f5d21e9..fa394cd895 100644
qt_enable_cmake_languages()
--
-2.30.0
+2.31.1