diff options
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 | 26 |
1 files changed, 9 insertions, 17 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 6327f1f2d232..d8f535585fea 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 e682df25245fd2731bfe0572b2668e47f7ea3e99 Mon Sep 17 00:00:00 2001 +From 8507a185bd7614aa5250495904348ac25ad1b8ac 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 +Subject: [PATCH 7/7] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer static libraries -Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c +Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099 --- - cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 5 +++++ - 1 file changed, 5 insertions(+) + cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -index 934c34b01c..bada2aff0c 100644 +index af8c3d18c4..eb1f47c6e1 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -1,6 +1,10 @@ @@ -21,17 +21,9 @@ index 934c34b01c..bada2aff0c 100644 + set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}") +endif () + - ###################################### + ############################################### # - # Macros for building Qt modules -@@ -285,6 +289,7 @@ macro(qt_prepare_standalone_project) - endmacro() - - macro(qt_build_repo_begin) -+ - qt_build_internals_set_up_private_api() - qt_enable_cmake_languages() - + # Macros and functions for building Qt modules -- -2.31.1 +2.32.0 |