diff options
Diffstat (limited to '0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch')
| -rw-r--r-- | 0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch new file mode 100644 index 000000000000..83810470c590 --- /dev/null +++ b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -0,0 +1,31 @@ +From 1e0190cb9b33cd6aaef745da13d8e4de85a50775 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 9da1361c95a..5e802dea4c5 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.44.0 + |