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 | 22 |
1 files changed, 12 insertions, 10 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 index 32a4227c5465..b062b0c3eddb 100644 --- a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,29 +1,31 @@ -From 089d8ff8c8306acdfa6c9c96c41498b2e5771be6 Mon Sep 17 00:00:00 2001 +From c43b98b48c09a6a45810f899fc5775542ffb7e1c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/31] Adjust linker flags for static build with cmake/mingw-w64 -Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d +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 | 7 +++++++ - 1 file changed, 7 insertions(+) + 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 58d1d5b366..967dc64a19 100644 +index 020b14cc83..fb9d79dc80 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -179,3 +179,10 @@ if (ANDROID_PLATFORM) +@@ -203,3 +203,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain) + ) endif() - - _qt5_Core_check_file_exists(${_Qt5CTestMacros}) + !!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) -+!!ENDIF -- -2.26.1 +2.26.2 |