diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-11 23:13:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 23:13:40 -0700 |
| commit | 6a9371b571645a7c0c0fb34f6acaca03d8e573e5 (patch) | |
| tree | 9ec0a68edb39e60cd4efefe991270c44f94a339d | |
| parent | 7e65405c3154b4dcd81b04f2275546a280945176 (diff) | |
| parent | 29be95a5e58d00ecd6ec85ff66171d0d3d19ccd0 (diff) | |
| download | vcpkg-6a9371b571645a7c0c0fb34f6acaca03d8e573e5.tar.gz vcpkg-6a9371b571645a7c0c0fb34f6acaca03d8e573e5.zip | |
Merge pull request #6040 from stfnp/fix-qt5-static-linking
Add missing dependency for static Qt builds on Windows
| -rw-r--r-- | ports/qt5-base/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-base/vcpkg-cmake-wrapper.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 8d1e6b8f6..7574d011d 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ Source: qt5-base
-Version: 5.12.1-3
+Version: 5.12.1-4
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl
diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 64496cec0..6b5727755 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -35,7 +35,7 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") if(MSVC)
set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES
- Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib)
+ Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib)
add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d)
@@ -63,4 +63,4 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") qcocoa)
endif()
-endif()
\ No newline at end of file +endif()
|