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/wix/ComponentGroups.wxi | |
| 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/wix/ComponentGroups.wxi')
| -rw-r--r-- | packaging/wix/ComponentGroups.wxi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 8631c805d2..f6c70433c2 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -434,13 +434,14 @@ </Fragment> <!-- MMDBResolve --> + <?ifdef MMDBRESOLVE_EXE?> <Fragment> <DirectoryRef Id="INSTALLFOLDER"> <Component Id="cmpMmdbresolve_exe" Guid="*"> <File Id="filMmdbresolve_exe" KeyPath="yes" Source="$(var.Staging.Dir)\mmdbresolve.exe" /> </Component> <Component Id="cmpMmdbresolve_html" Guid="*"> - <File Id="filMmdbresolve_html" KeyPath="yes" Source="$(var.Staging.Dir)\rawshark.html" /> + <File Id="filMmdbresolve_html" KeyPath="yes" Source="$(var.Staging.Dir)\mmdbresolve.html" /> </Component> </DirectoryRef> </Fragment> @@ -450,6 +451,7 @@ <ComponentRef Id="cmpMmdbresolve_html" /> </ComponentGroup> </Fragment> + <?endif?> <!-- Androiddump --> <Fragment> |