URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a758e31b90538d52a1fb4f7b0fb108076e7e1275
Submitter: "Pascal Quantin <pascal@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
a758e31 by Tomasz Moń (desowin@xxxxxxxxx):
CMake: Include glib dlls in Windows installer
In debug builds different glib .dll files are being used than in release
builds. List all .dll files in (generated) nsis all-manifest.nsh and WiX
DependentComponents.wxs guarding the debug files under BUNDLE_DEBUG_DLLS
ifdef. CMake generator expression is used to include /DBUNDLE_DEBUG_DLLS
parameter to MakeNSIS in debug builds. Similarly, -dBUNDLE_DEBUG_DLLS is
added to WiX candle in debug builds.
Change-Id: Ibfe7a640d25ba25f14bb910708ab83d0634d48db
Reviewed-on: https://code.wireshark.org/review/34703
Petri-Dish: Pascal Quantin <pascal@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@xxxxxxxxxxxxx>
Actions performed:
from efb6fa1 AMP: Remove a self-assignment.
add a758e31 CMake: Include glib dlls in Windows installer
Summary of changes:
packaging/nsis/CMakeLists.txt | 12 ++++++++++-
packaging/wix/CMakeLists.txt | 50 +++++++++++++++++++++++++++++++++----------
2 files changed, 50 insertions(+), 12 deletions(-)