diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-03-06 15:29:34 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-03-07 00:16:54 +0000 |
| commit | e3c263c01236e7c31ec23f6c3d8750d7e92fb5a3 (patch) | |
| tree | 54fcc9a118fc5ecb29984bd213837902fcfb8e0c /packaging/nsis/wireshark.nsi | |
| parent | f0fb6ee50c953ac07eb76d47036a761a57f35491 (diff) | |
NSIS, WiX: Handle the presence or absence of mmdbresolve.
Only install mmdbresolve if MAXMINDDB_FOUND is true.
Fixup the Qt about box and WiX GTK defines while we're here.
Change-Id: I7ac3c21ddb4aebc1dae1c3d8cfd2bcafc4139d2e
Reviewed-on: https://code.wireshark.org/review/26299
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/nsis/wireshark.nsi')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 404c6a326d..5af8ad5dc4 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1117,6 +1117,7 @@ File "${STAGING_DIR}\rawshark.exe" File "${STAGING_DIR}\rawshark.html" SectionEnd +!ifdef MMDBRESOLVE_EXE Section /o "MMDBResolve" SecMMDBResolve ;------------------------------------------- SetOutPath $INSTDIR @@ -1124,6 +1125,7 @@ File "${STAGING_DIR}\mmdbresolve.html" SetOutPath $INSTDIR File "${STAGING_DIR}\mmdbresolve.exe" SectionEnd +!endif Section /o "Androiddump" SecAndroiddumpinfos ;------------------------------------------- |