diff options
Diffstat (limited to '0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch')
| -rw-r--r-- | 0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch new file mode 100644 index 000000000000..b9f81f22f439 --- /dev/null +++ b/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -0,0 +1,29 @@ +From 0aac929861fb8d60fbc66f2557e1b9c5022ff9c5 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Fri, 2 Jun 2017 16:42:07 +0200 +Subject: [PATCH 25/33] Adjust linker flags for static build with + cmake/mingw-w64 + +Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d +--- + src/corelib/Qt5CoreConfigExtras.cmake.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index ebe6644dfe..687d611b3f 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -190,3 +190,10 @@ get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH) + set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\") + + _qt5_Core_check_file_exists(${_Qt5CTestMacros}) ++ ++!!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.14.2 + |