diff options
| author | Pascal Quantin <pascal@wireshark.org> | 2019-03-20 09:03:17 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal@wireshark.org> | 2019-03-20 08:07:54 +0000 |
| commit | 9d44b759999ebc2afc81fdc6d9eb75132fe71a5d (patch) | |
| tree | 4d1f0351052d303d8fb21f6c54be333d0574287e /packaging | |
| parent | c01ace71efae9ccd2d59a3ab483cd31d7617177b (diff) | |
Windows: fix addition of Libxml2 DLLs in installers
Follow-up of gacc96e5206
Change-Id: Ibf49c4812b46ed282dccddb4fe6869154f6f9fed
Reviewed-on: https://code.wireshark.org/review/32487
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 062e54c33f..8ece226138 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -137,7 +137,7 @@ set(_all_manifest_contents "# Files required for all sections. Generated by CMak foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} + ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLLS} ${WINSPARKLE_DLL} ${ZLIB_DLL} # Needed for mmdbresolve ${MAXMINDDB_DLL} diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 999cd54f1f..2f1e8a1cb8 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -114,7 +114,7 @@ SET(unique_component "") foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} + ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLLS} ${WINSPARKLE_DLL} ${ZLIB_DLL} # Required for mmdbresolve ${MAXMINDDB_DLL} |