diff options
author | Martchus | 2016-12-08 21:12:17 +0100 |
---|---|---|
committer | Martchus | 2016-12-08 21:12:17 +0100 |
commit | d6d9f6b4af59f7a80b1013c6710baf5dfabf67bf (patch) | |
tree | 8a0bb6262420ada7f78fd1a8fefe8b34fc0e42d8 /qt5-win32-static-cmake-link-ws2_32-and--static.patch | |
parent | 32d7004cff60350e0b0a9a7ddba7f4260ca5bf92 (diff) | |
download | aur-d6d9f6b4af59f7a80b1013c6710baf5dfabf67bf.tar.gz |
Fix misc issuss
Diffstat (limited to 'qt5-win32-static-cmake-link-ws2_32-and--static.patch')
-rw-r--r-- | qt5-win32-static-cmake-link-ws2_32-and--static.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/qt5-win32-static-cmake-link-ws2_32-and--static.patch b/qt5-win32-static-cmake-link-ws2_32-and--static.patch deleted file mode 100644 index be20044903f1..000000000000 --- a/qt5-win32-static-cmake-link-ws2_32-and--static.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/corelib/Qt5CoreConfigExtras.cmake.in.orig 2014-11-09 00:54:20.852201500 +0000 -+++ src/corelib/Qt5CoreConfigExtras.cmake.in 2014-11-09 00:55:52.437439900 +0000 -@@ -165,3 +165,12 @@ - set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\") - - _qt5_Core_check_file_exists(${_Qt5CTestMacros}) -+ -+get_target_property(_libType Qt5::Core TYPE) -+if(_libType STREQUAL \"STATIC_LIBRARY\" AND WIN32) -+ set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>) -+ # INTERFACE_LINK_LIBRARIES is used to pass a linker flag (-static) -+ # and a library (ws2_32) -+ set_target_properties(Qt5::Core PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") -+ unset(_isExe) -+endif() |