* Update patch for static freetype2 in qt5 for brotli library renaming * Update patches for Qt 5 SQL drivers to include crypt32 * This library is required by OpenSSL's crypto library. Not sure why there were no linker errors before.
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 3fb4f9b9186af92e95cd35ba994ee9e9fa3be4d6 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Fri, 2 Jun 2017 16:42:07 +0200
|
|
Subject: [PATCH 22/32] Adjust linker flags for static build with
|
|
cmake/mingw-w64
|
|
|
|
It is not clear anymore where I picked that change up and for
|
|
what reason. Never touch a running system so let's keep it.
|
|
|
|
Change-Id: Iad665f18da5b4540f0899829a0165e1d3aa4ea60
|
|
---
|
|
src/corelib/Qt5CoreConfigExtras.cmake.in | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
|
index 9da1361c95..5e802dea4c 100644
|
|
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
|
|
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
|
@@ -206,3 +206,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain)
|
|
)
|
|
endif()
|
|
!!ENDIF
|
|
+
|
|
+!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
|
|
+set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>)
|
|
+# INTERFACE_LINK_LIBRARIES is used to pass a linker flag '-static' and library ws2_32
|
|
+set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
|
|
+unset(_isExe)
|
|
--
|
|
2.43.0
|
|
|