diff options
| author | Martchus | 2023-04-05 10:45:23 +0200 |
|---|---|---|
| committer | Martchus | 2023-04-05 10:45:23 +0200 |
| commit | fe24b3b52b6ac4dbbd6d4167c897e69f290eaac3 (patch) | |
| tree | 32c2a4521593dd776c95f7d5b142ded816625a5f /0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch | |
| parent | e71d07ca28935fa674ae7759308c9491713d9e60 (diff) | |
| download | aur-fe24b3b52b6ac4dbbd6d4167c897e69f290eaac3.tar.gz | |
Update to 6.5.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.patch | 10 |
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 98421c2ac383..c0b5a79893d5 100644 --- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch +++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch @@ -1,4 +1,4 @@ -From ba72e0065156596ba81556e618ae8ff6c7aec091 Mon Sep 17 00:00:00 2001 +From 1c52bbeebea4325f7e6ff5adaa987c1aaaedcebe Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 8 Nov 2020 00:34:09 +0100 Subject: [PATCH 07/12] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer @@ -10,12 +10,12 @@ Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099 1 file changed, 4 insertions(+) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -index f51e4d6ab5..175671ebcd 100644 +index 5246d67c37..4637820272 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -@@ -1,6 +1,10 @@ +@@ -4,6 +4,10 @@ # These values should be kept in sync with those in qtbase/.cmake.conf - cmake_minimum_required(VERSION 3.16...3.20) + cmake_minimum_required(VERSION 3.16...3.21) +if (CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE) + set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}") @@ -25,5 +25,5 @@ index f51e4d6ab5..175671ebcd 100644 # # Macros and functions for building Qt modules -- -2.39.2 +2.40.0 |