diff options
| author | Martchus | 2021-10-02 12:37:19 +0200 |
|---|---|---|
| committer | Martchus | 2021-10-02 12:37:19 +0200 |
| commit | fe505c2c92c74816f59638d765779412b0d775f8 (patch) | |
| tree | c1e5ac643b71438d37304f3c1ba2f8420db3f893 /0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch | |
| parent | 09f01e9025a3bb12e98ff0ba50996657bf453eca (diff) | |
| download | aur-fe505c2c92c74816f59638d765779412b0d775f8.tar.gz | |
Update to 6.2.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 | 6 |
1 files changed, 3 insertions, 3 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 c9c3e1be697e..2cb73c434944 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 8507a185bd7614aa5250495904348ac25ad1b8ac Mon Sep 17 00:00:00 2001 +From 6139785883e6ceee0369390debd39a90c18d821b Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 8 Nov 2020 00:34:09 +0100 Subject: [PATCH 7/8] 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 af8c3d18c4..eb1f47c6e1 100644 +index 89c13afe01..6a21b6e266 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) + cmake_minimum_required(VERSION 3.16...3.20) +if (CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE) + set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}") |